Maikel Linke ffa960b02e Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +10:00

..

assets

Auto-merge from CI [skip ci]

2015-06-04 15:39:43 +10:00

controllers

Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +10:00

helpers

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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 remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +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' into customers

2015-06-03 15:19:40 +08:00

views

Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +10:00