Rohan Mitchell 952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit ...

Conflicts:
	spec/features/admin/bulk_product_update_spec.rb

2015-05-29 15:08:30 +10:00

..

assets

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

controllers

Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 14:36:51 +10:00

helpers

BPE: new col for tax category

2015-05-21 11:06:08 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

overrides

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit

2015-05-22 18:17:20 +10:00

views

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00