Merge pull request #17799 from civicrm/5.28

author Eileen McNaughton <emcnaughton@wikimedia.org>

Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)

committer GitHub <noreply@github.com>

Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)
committer GitHub <noreply@github.com>
Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)
diff --cc CRM/Report/Form.php
Simple merge
diff --cc tests/phpunit/CRM/Dedupe/MergerTest.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)
committer	GitHub <noreply@github.com>
	Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)
		1	2
CRM/Report/Form.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Dedupe/MergerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history