Files
openfoodnetwork/app/views/admin/enterprises/index.html.haml
Rafael Schouten 08cd273be3 Merge branch 'migrate_ent_types' into bugfix
Conflicts:
	app/models/spree/ability_decorator.rb
2014-10-18 07:37:41 +11:00

1.9 KiB