Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

2016-03-15 10:51:18 -04:00
parent c3ab0c8ffa 32113f3ae4
commit 7e978e5d64
43 changed files with 2083 additions and 1697 deletions
--- a/workflow/engine/methods/processes/processes_Import_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Import_Ajax.php
@@ -25,6 +25,7 @@
 use \ProcessMaker\Importer\XmlImporter;

 ini_set("max_execution_time", 0);
+$affectedGroups = array();

 /*----------------------------------********---------------------------------*/
 if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") &&