CRM-CRM-20841 - Dedupe - Show on_hold, is_bulkmail or signature merge conflicts
authorThomas Schüttler <tschuettler@oxfam.de>
Mon, 10 Jul 2017 15:01:58 +0000 (17:01 +0200)
committerThomas Schüttler <tschuettler@oxfam.de>
Mon, 10 Jul 2017 15:01:58 +0000 (17:01 +0200)
commit2a7e1ddc0c496d6dd02384429a8519ca206a2c3f
treea79959fc7c35e68cd9c9032899dd506d8c1d872f
parent7bfe1d0dda114b76e3db5dce4c025fb3430e3bb7
CRM-CRM-20841 - Dedupe - Show on_hold, is_bulkmail or signature merge conflicts
CRM/Dedupe/Merger.php
CRM/Utils/Mail.php
templates/CRM/Contact/Form/Merge.tpl