SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-04 10:14:13 +08:00
Code Issues Projects Packages Activity Actions
SuiteCRM-Core/public/legacy/modules/AOR_Conditions
History
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
..
language Merge commit '114b895b6d' into merge_develop 2021-08-30 10:18:23 +01:00
AOR_Condition.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
conditionLines.js Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
conditionLines.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
vardefs.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00