Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

api/testing_support

fixing a bunch of tests

2015-02-12 16:36:18 +11:00

core/controller_helpers

Display overridden prices when products are in the cart

2015-01-12 14:58:35 +11:00

money_decorator.rb

Fix grammar

2015-01-08 10:39:51 +11:00

product_filters.rb

Refactor libs to use enterprise instead of supplier and distributor

2012-10-29 14:57:03 +11:00