Merge pull request #10630 from tschuettler/CRM-CRM-20841
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 6 Jun 2018 06:53:58 +0000 (18:53 +1200)
committerGitHub <noreply@github.com>
Wed, 6 Jun 2018 06:53:58 +0000 (18:53 +1200)
commit1c5bc02c1bbfc3cbbee279e61b488787a4c41daf
treed2d611a954192e85f2bc668b85da0284cf45a9fe
parente09262a9990572446bbf093402aea6a0e355c95a
parent2a7e1ddc0c496d6dd02384429a8519ca206a2c3f
Merge pull request #10630 from tschuettler/CRM-CRM-20841

CRM-20841 - Dedupe - Show on_hold, is_bulkmail or signature mergeā€¦
CRM/Dedupe/Merger.php
CRM/Utils/Mail.php
templates/CRM/Contact/Form/Merge.tpl