Rohan Mitchell 6d84cf7613 Merge branch 'master' into enterprises ...

Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb

2012-11-01 11:02:02 +11:00

..

open_food_web

Merge branch 'master' into enterprises

2012-11-01 11:02:02 +11:00

spree

Refactor libs to use enterprise instead of supplier and distributor

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