Maikel Linke 5d5fda3a25 Merge remote-tracking branch 'origin/master' into i18n ...

Conflicts:
	config/locales/en.yml

2015-11-13 10:07:29 +11:00

..

assets

Invalidate I18n asset if locale changes

2015-11-05 12:47:15 +11:00

controllers

Merge branch 'master' into folklabs-producer-emails

2015-11-11 14:20:25 +11:00

helpers

Detailed xero report

2015-09-22 09:15:55 +10:00

jobs

Merge branch 'master' into folklabs-producer-emails

2015-10-16 12:38:54 +11:00

mailers

Fix quantity calculation

2015-11-05 09:43:44 +11:00

models

Merge branch 'master' into folklabs-producer-emails

2015-11-11 14:20:25 +11:00

overrides

Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.

2015-11-11 11:53:04 +11:00

presenters

Admin can set enterprise fee's tax category

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

serializers/api

Variable weights improvements additions

2015-08-04 20:13:28 +01:00

views

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

2015-11-13 10:07:29 +11:00