Merge pull request #16385 from civicrm/5.22

author Seamus Lee <seamuslee001@gmail.com>

Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)

committer GitHub <noreply@github.com>

Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)
author Seamus Lee <seamuslee001@gmail.com>
Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)
committer GitHub <noreply@github.com>
Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)
diff --cc tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php
Simple merge
diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)
committer	GitHub <noreply@github.com>
	Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)
		1	2
tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviUnitTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history