Merge pull request #20683 from civicrm/5.39

author Eileen McNaughton <emcnaughton@wikimedia.org>

Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)

committer GitHub <noreply@github.com>

Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)
committer GitHub <noreply@github.com>
Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)
diff --cc Civi/Test/Api3TestTrait.php
Simple merge
diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)
committer	GitHub <noreply@github.com>
	Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)
		1	2
Civi/Test/Api3TestTrait.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviUnitTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history