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
6d84cf76130b2e5345aba90ffebcb4aaafc751a1
openfoodnetwork/app
History
Rohan Mitchell 6d84cf7613 Merge branch 'master' into enterprises 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
2012-11-01 11:02:02 +11:00
..
assets
Merge branch 'master' into enterprises
2012-11-01 11:02:02 +11:00
controllers
Merge branch 'master' into enterprises
2012-11-01 11:02:02 +11:00
helpers
Rename DistributorsHelper to EnterprisesHelper
2012-11-01 10:07:55 +11:00
mailers
new rails 3.1.4 app
2012-03-27 10:10:26 +11:00
models
Remove old supplier and distributor routes, models, controllers, views, specs
2012-11-01 09:55:45 +11:00
overrides
Merge branch 'master' into enterprises
2012-11-01 11:02:02 +11:00
views
Merge branch 'master' into enterprises
2012-11-01 11:02:02 +11:00