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

..

shopping

Do not show out of stock lines on order confirmation page

2015-01-29 13:19:04 +11:00

authentication_spec.rb

…

cms_spec.rb

…

groups_spec.rb

fixing a bunch of tests

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

home_spec.rb

Updating home spec to reflect new shopfront url

2015-01-22 10:19:47 +11:00

producers_spec.rb

…

registration_spec.rb

…

suppliers_spec.rb

Give distributors a payment and shipping method where required

2014-10-31 16:02:43 +11:00