raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f4e0baa56acd2ea3e050c69f4c71a238cfb02ce4
openfoodnetwork/spec/features
History
Rohan Mitchell 610a4c03fe Merge branch 'master' into redesign 
Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
..
admin
Merge branch 'master' into redesign
2015-06-10 18:27:50 +10:00
consumer
Merge branch 'master' into redesign
2015-06-10 18:27:50 +10:00