Commit graph

9 commits

Author SHA1 Message Date
Jack Anderson
e3e9956e12 Merge next into suite 8 2024-05-22 15:58:18 +01:00
Jack Anderson
deec3711e0 Merge next into suite 8 2023-11-06 16:01:06 +00: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
8c553f7c3c Merge next into suite 8 2023-06-30 10:54:51 +01:00
Clemente Raposo
eba6af8139 Merge next into suite 8
Merge commit '601c0c039b' into release/8.3.0

# Conflicts:
#	public/legacy/files.md5
#	public/legacy/suitecrm_version.php
2023-05-08 12:37:33 +01:00
Jack Anderson
caf6df3b43 Merge next into suite 8 2023-02-28 14:12:02 +00:00
Jack Anderson
6b586e1678 Merge next into suite 8 2022-11-10 09:41:20 +00:00
Dillon-Brown
994561461a [Legacy] Remove legacy composer
- Remove composer json and lock files

Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
2021-04-13 09:10:11 +00:00
Dillon-Brown
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00