Merge pull request #14298 from eileenmcnaughton/dedupe_stats

author colemanw <coleman@civicrm.org>

Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)

committer GitHub <noreply@github.com>

Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)
author colemanw <coleman@civicrm.org>
Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)
committer GitHub <noreply@github.com>
Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)
diff --cc CRM/Dedupe/Merger.php
Simple merge
diff --cc api/v3/utils.php
Simple merge
diff --cc tests/phpunit/api/v3/ContactTest.php
Simple merge
author	colemanw <coleman@civicrm.org>
	Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)
committer	GitHub <noreply@github.com>
	Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)
		1	2
CRM/Dedupe/Merger.php	patch \|	diff1 \|	diff2 \|	blob \| history
api/v3/utils.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContactTest.php	patch \|	diff1 \|	diff2 \|	blob \| history