Rafael Schouten 883e5f1095 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend ...

Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml

2014-09-19 17:22:29 +10:00

..

assets

Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend

2014-09-19 17:22:29 +10:00

controllers

Merging master into all the things

2014-09-12 13:28:30 +10:00

helpers

Explain weird spree override

2014-09-17 13:12:27 +10:00

mailers

fix typos and add missing helper

2014-09-16 16:10:48 +10:00

models

reorganise and document enterprise categories

2014-09-19 16:44:28 +10:00

overrides

Merging master into all the things

2014-09-12 13:28:30 +10:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

serializers

bugfix is_profile bool

2014-09-19 16:44:51 +10:00

views

Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend

2014-09-19 17:22:29 +10:00