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 |
|
Clemente Raposo
|
123e5a9f26
|
Merge commit '9d484f189a' into release/8.2.2
# Conflicts:
# public/legacy/files.md5
# public/legacy/modules/InboundEmail/EditView.html
# public/legacy/modules/Users/tpls/EditViewFooter.tpl
# public/legacy/suitecrm_version.php
|
2022-12-21 11:49:42 +00:00 |
|
Dillon-Brown
|
46f1d95342
|
[Legacy] Update legacy vendor pathing
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
|
2021-04-13 09:10:12 +00:00 |
|
Dillon-Brown
|
11be803da2
|
Merge commit '8e4cc94994' as 'public/legacy'
|
2021-03-31 15:37:32 +01:00 |
|
