openfoodnetwork

mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00

Files

Will Marshall 20d7484134 Merge branch 'master' into laura_and_will

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

…

…

2014-07-28 13:43:31 +10:00

base_controller_spec.rb

2014-06-19 11:41:24 +10:00

cart_controller_spec.rb

…

checkout_controller_spec.rb

2014-07-25 12:44:14 +10:00

enterprises_controller_spec.rb

Removing code

2014-05-14 15:16:29 +10:00

groups_controller_spec.rb

2014-06-24 17:15:31 +10:00

home_controller_spec.rb

2014-06-26 15:04:32 +10:00

map_controller_spec.rb

2014-06-19 11:41:24 +10:00

producers_controller_spec.rb

2014-06-26 15:04:32 +10:00

shop_controller_spec.rb

2014-07-10 14:49:21 +10:00

user_passwords_controller_spec.rb

…

user_registrations_controller_spec.rb

…