Andrew Spinks 7cb054f430 Merge branch 'master' into order-cycle-selection ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/spree/orders_controller_decorator.rb
	app/models/enterprise.rb
	app/models/spree/order_decorator.rb
	app/views/spree/checkout/_other_available_distributors.html.erb
	app/views/spree/products/_add_to_cart.html.haml
	lib/open_food_web/distributor_change_validator.rb
	spec/spec_helper.rb

2013-07-23 14:42:57 +10:00

..

cms_fixtures/example.com

Add base install of Comfortable Mexican Sofa

2012-10-11 10:50:36 +11:00

default/spree

Added first working acceptance spec for supplier.

2012-06-09 14:41:09 +10:00

migrate

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

sanitize_data.rb

Add script to sanitize order and user data.

2013-02-10 16:54:39 +11:00

schema.rb

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

seeds.rb

Merge branch 'local-organics'

2013-07-23 11:40:03 +10:00