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

..

enterprises_controller_spec.rb

Remove redundant spec line, test that sells is not changed

2015-04-17 15:42:42 +10:00

order_cycles_controller_spec.rb

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

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