Rohan Mitchell 7640eb497a Merge branch 'supplied-active-products-on-hand' ...

Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb

2013-07-29 11:05:42 +10:00

..

admin

Merge branch 'master' of github.com:eaterprises/openfoodweb

2013-07-23 18:02:28 +10:00

chili

Fix test regressions with multiple 'Save and Continue' buttons in checkout

2013-07-23 17:48:54 +10:00

consumer

Merge branch 'supplied-active-products-on-hand'

2013-07-29 11:05:42 +10:00