Merge pull request #25815 from civicrm/5.60

author Eileen McNaughton <emcnaughton@wikimedia.org>

Wed, 15 Mar 2023 01:29:34 +0000 (14:29 +1300)

committer GitHub <noreply@github.com>

Wed, 15 Mar 2023 01:29:34 +0000 (14:29 +1300)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Wed, 15 Mar 2023 01:29:34 +0000 (14:29 +1300)
committer GitHub <noreply@github.com>
Wed, 15 Mar 2023 01:29:34 +0000 (14:29 +1300)
diff --cc CRM/Dedupe/Merger.php
Simple merge
diff --cc ext/civiimport/Civi/Api4/Event/Subscriber/ImportSubscriber.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Wed, 15 Mar 2023 01:29:34 +0000 (14:29 +1300)
committer	GitHub <noreply@github.com>
	Wed, 15 Mar 2023 01:29:34 +0000 (14:29 +1300)
		1	2
CRM/Dedupe/Merger.php	patch \|	diff1 \|	diff2 \|	blob \| history
ext/civiimport/Civi/Api4/Event/Subscriber/ImportSubscriber.php	patch \|	diff1 \|	diff2 \|	blob \| history