Clemente Raposo 5aa0daf046 Merge next into suite 8 ... Merge commit 'de4bf25cb3' into release/8.4.0-beta # Conflicts: # public/legacy/data/SugarBean.php # public/legacy/include/Smarty/plugins/function.sugarvar.php # public/legacy/include/SugarDateTime.php # public/legacy/include/database/MysqliManager.php # public/legacy/modules/Alerts/metadata/listviewdefs.php # public/legacy/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php # public/legacy/modules/Trackers/metadata/SearchFields.php # public/legacy/modules/Trackers/metadata/listviewdefs.php # public/legacy/modules/UpgradeWizard/SugarMerge/EditViewMerge.php # public/legacy/suitecrm_version.php		2023-07-21 15:22:52 +01:00
..
ImportMap.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapAct.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapCsv.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapGoogle.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapOther.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapOutlook.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapSalesforce.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00
ImportMapTab.php	Merge next into suite 8	2023-07-21 15:22:52 +01:00