SuiteCRM/SuiteCRM-Core
0
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2026-07-28 23:36:57 +08:00
Code Issues Projects Packages Activity Actions
SuiteCRM-Core/public/legacy/modules/MergeRecords
History
Exact
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
..
language Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
controller.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
Menu.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Merge.js Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
MergeField.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
MergeRecord.php Merge commit '9d484f189a' into release/8.2.2 2022-12-21 11:49:42 +00:00
SaveMerge.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
SearchForm.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step1.html [Legacy] Merge Records Styling Fixes 2022-03-03 09:55:01 +00:00
Step1.php [Legacy] Merge Records Styling Fixes 2022-03-03 09:55:01 +00:00
Step2.html Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Step2.php [Legacy] Changes to support Legacy integration of Merge Duplicates action to Suite8 2021-06-07 17:29:30 +05:30
Step3.html [Legacy] Merge Records Styling Fixes 2022-03-03 09:55:01 +00:00
Step3.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
vardefs.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00