luisramos0 b325cea6cb Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00

..

assets

Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00

controllers

Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00

helpers

Remove changes related to enterprise trials as they dont make sense without business models and account invoices

2019-02-25 14:37:16 +00:00

jobs

Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00

mailers

Fix merge typo in the cancel email method of the order mailer decorator

2019-01-08 15:31:28 +00:00

models

Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00

overrides

Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00

presenters

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

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

serializers/api

Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand

2019-02-26 12:47:11 +00:00

services

Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand

2019-02-26 12:47:11 +00:00

validators

Add validator for integer arrays

2019-02-08 21:26:36 +00:00

views

Merge branch 'master' into 2-0-stable-Mar6

2019-03-06 09:19:53 +00:00