Rohan Mitchell 6b1c125b03 Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails ...

Conflicts:
	Gemfile.lock
	app/controllers/admin/order_cycles_controller.rb
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/order_cycles/show.rep
	db/schema.rb
	spec/controllers/admin/order_cycles_controller_spec.rb

2015-04-29 14:42:17 +10:00

..

cms_fixtures/example.com

Add base install of Comfortable Mexican Sofa

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

default/spree

Update states to match

2013-10-30 10:42:23 +11:00

migrate

Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails

2015-04-29 14:42:17 +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 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails

2015-04-29 14:42:17 +10:00

seeds.rb

Remove landing page images

2014-07-17 14:26:46 +10:00

suburb_seeds.rb

fix suburb typo

2014-09-14 12:27:24 +10:00