Merge pull request #21258 from civicrm/5.41

author Seamus Lee <seamuslee001@gmail.com>

Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)

committer GitHub <noreply@github.com>

Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)
author Seamus Lee <seamuslee001@gmail.com>
Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)
committer GitHub <noreply@github.com>
Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)
diff --cc api/v3/Order.php
Simple merge
diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)
committer	GitHub <noreply@github.com>
	Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)
		1	2
api/v3/Order.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history