Rohan Mitchell da57e04a50 Merge branch 'fix-groups-map' of https://github.com/bingxie/openfoodnetwork into fix-groups-map

2016-05-13 16:02:22 +10:00

..

assets

Auto-merged master into uk-order-cycle-report on deployment.

2016-05-13 11:28:15 +10:00

controllers

Admin can set bugherd API key

2016-05-04 11:42:07 +10:00

helpers

Allowing Order Management Report to filter by multiple payment / shipping methods at once

2016-04-02 01:04:09 +11:00

jobs

Run a job queue heartbeat every 5 minutes

2016-04-13 16:48:24 +10:00

mailers

Simplify

2016-05-13 10:36:23 +10:00

models

Merge remote-tracking branch 'origin/master' into HEAD

2016-05-06 13:58:37 +10:00

overrides

small i18n fixes #878

2016-04-14 16:10:21 -05:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Merge remote-tracking branch 'origin/master' into HEAD

2016-05-06 13:58:37 +10:00

views

Merge branch 'fix-groups-map' of https://github.com/bingxie/openfoodnetwork into fix-groups-map

2016-05-13 16:02:22 +10:00