Fix conflicts merging to develop

2020-05-07 19:14:11 +00:00
parent 10da6f86bc
commit ec443aac1b
2 changed files with 16 additions and 7 deletions
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -77,7 +77,8 @@ class System
        'mobile_offline_tables_download_interval' => 24,
        'highlight_home_folder_enable' => 0,
        'highlight_home_folder_refresh_time' => 10,
-        'highlight_home_folder_scope' => 'unassigned' // For now only this list is supported
+        'highlight_home_folder_scope' => 'unassigned', // For now only this list is supported
+        'disable_advanced_search_case_title_fulltext' => 0
    ];

    /**