Merge remote-tracking branch 'origin/dev_424'

systopia · May 11, 2017 · cdf2441 · cdf2441
2 parents 1ca2bd3 + ed26baa
commit cdf2441
Show file tree

Hide file tree

Showing 19 changed files with 1,595 additions and 12 deletions.
diff --git a/CRM/Campaign/KPI.php b/CRM/Campaign/KPI.php
@@ -14,6 +14,8 @@
 | written permission from the original author(s).        |
 +--------------------------------------------------------*/
 
+require_once('CRM/CampaignTree/Tree.php');
+
 class CRM_Campaign_KPI {
 
    /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
     | written permission from the original author(s).        |
     +--------------------------------------------------------*/
+    require_once('CRM/CampaignTree/Tree.php');
     class CRM_Campaign_KPI {
        /**
@@ Expand Down @@