Conflicts

2017-02-10 17:59:06 -04:00
parent 5606c1c565 3e687e6bb3
commit efb1576cb5
15 changed files with 257 additions and 90 deletions
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -78,7 +78,8 @@ class System
        'leave_case_warning' => 0,
        'server_hostname_requests_frontend' => '',
        'load_headers_ie' => 0,
-        'redirect_to_mobile' => 0
+        'redirect_to_mobile' => 0,
+        'disable_php_upload_execution' => 0
    );

    /**