Jack Anderson
|
1a5aa0b081
|
Merge next into suite 8
|
2023-08-23 11:03:53 +01:00 |
|
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 |
|
Jack Anderson
|
10efe5a340
|
Merge next into suite 8
|
2023-01-24 10:56:09 +00:00 |
|
Jack Anderson
|
6b586e1678
|
Merge next into suite 8
|
2022-11-10 09:41:20 +00:00 |
|
Jack Anderson
|
696388d662
|
Merge next into suite 8
Merge commit '3fb6e4bb8e' into release/8.1.3
# Conflicts:
# public/legacy/files.md5
# public/legacy/suitecrm_version.php
|
2022-08-11 14:03:24 +01:00 |
|
Clemente Raposo
|
63b969478d
|
Merge next into suite 8
Merge commit '5fa70e2794' into release/8.0.4
# Conflicts:
# public/legacy/suitecrm_version.php
|
2022-03-01 14:38:06 +00:00 |
|
Dillon-Brown
|
11be803da2
|
Merge commit '8e4cc94994' as 'public/legacy'
|
2021-03-31 15:37:32 +01:00 |
|
