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)
commit904a65bd20ed2506a43397f94a2606c606049932
tree0798c93826faeb1a9880b0dd17fb7b06cefd3067
parenta968364d52f7c551b663c9811d44d6c1dab547ae
parent86b14b5914cd8966b7a878ec9f7599d5b41651b7
Merge pull request #13895 from eileenmcnaughton/format

Fix mis-formatting of Email greeting id, Address greeting id etc
CRM/Dedupe/Merger.php
templates/CRM/Contact/Form/Merge.tpl