[interchange: 2/2] Merge pull request #109 from pullingshots/master

[David Christensen]

commit 49e38c1b21b5374dbae379633f1e7678e2e9ea06
Merge: ef4856e... 5aa1333...
Author: David Christensen <david at endpoint.com>
Date:   Sun Mar 4 11:02:14 2018 -0600

    Merge pull request #109 from pullingshots/master
    
    FIX: exclude canceled orders from reports

 .../UI/pages/admin/reports/order/ByAffiliate.html  |    2 +-
 dist/lib/UI/pages/admin/reports/order/BySKU.html   |    2 +-
 dist/lib/UI/pages/admin/reports/order/Detail.html  |    2 +-
 dist/lib/UI/pages/admin/reports/order/Monthly.html |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---