SuiteCRM/SuiteCRM-Core
0
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2026-07-27 23:29:19 +08:00
Code Issues Projects Packages Activity Actions
SuiteCRM-Core/public/legacy/modules/MailMerge
History
Exact
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 '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
controller.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
DetailView.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
EditView.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
get_doc.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
index.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
MailMerge.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
Menu.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Merge.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Merge.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
merge_query.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
modules_array.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Save.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
Step1.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step1.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
Step2.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step2.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step3.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step3.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
Step4.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step4.php Merge next into suite 8 2023-07-21 15:22:52 +01:00
Step5.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step5.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00