Merge pull request #7220 from ucam-dar/CRM-17556
authorDave Greenberg <dave@civicrm.org>
Thu, 3 Dec 2015 00:26:20 +0000 (16:26 -0800)
committerDave Greenberg <dave@civicrm.org>
Thu, 3 Dec 2015 00:26:20 +0000 (16:26 -0800)
commit8d1cd6ab03cc23c6a3156f4be6debd650da9cc59
tree3e445deafc222817f716cc01a7abb31bb5697d55
parent5e9ad348da364aab490a4ab2fca4664002d80db6
parentdd1dc6562d920733bcfe75ce067e87cfcfbc1467
Merge pull request #7220 from ucam-dar/CRM-17556

CRM-17556 Dedupe improvements
CRM/Contact/Form/Merge.php
CRM/Dedupe/Merger.php
css/civicrm.css
templates/CRM/Contact/Form/Merge.tpl