Rob Harrington 6a610ff7a4 Merge remote-tracking branch 'origin/master' into uk/trial-length

2016-05-20 12:22:47 +10:00

..

assets

Merge remote-tracking branch 'origin/master' into uk/trial-length

2016-05-20 12:22:47 +10:00

controllers

Merge remote-tracking branch 'origin/master' into uk/trial-length

2016-05-20 12:22:47 +10:00

helpers

Adding configurable Shop Trial Length in business model

2016-04-15 16:51:07 +01:00

jobs

Run a job queue heartbeat every 5 minutes

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

mailers

Fixing producer emails so that they calculate tax correctly

2016-05-20 11:01:33 +10:00

models

Merge remote-tracking branch 'origin/master' into uk/trial-length

2016-05-20 12:22:47 +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 remote-tracking branch 'origin/master' into uk/trial-length

2016-05-20 12:22:47 +10:00