projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a968364 86b14b5)
Merge pull request #13895 from eileenmcnaughton/format
authorcolemanw <coleman@civicrm.org>
Fri, 29 Mar 2019 18:35:47 +0000 (14:35 -0400)
committerGitHub <noreply@github.com>
Fri, 29 Mar 2019 18:35:47 +0000 (14:35 -0400)
Fix mis-formatting of Email greeting id, Address greeting id etc

1  2 
CRM/Dedupe/Merger.php patch | diff1 | diff2 | blob | history
templates/CRM/Contact/Form/Merge.tpl patch | diff1 | diff2 | blob | history

diff --cc CRM/Dedupe/Merger.php
Simple merge
diff --cc templates/CRM/Contact/Form/Merge.tpl
Simple merge