Merge pull request #19017 from eileenmcnaughton/remove_recur

author Matthew Wire <mjw@mjwconsult.co.uk>

Thu, 10 Dec 2020 23:46:06 +0000 (23:46 +0000)

committer GitHub <noreply@github.com>

Thu, 10 Dec 2020 23:46:06 +0000 (23:46 +0000)
author Matthew Wire <mjw@mjwconsult.co.uk>
Thu, 10 Dec 2020 23:46:06 +0000 (23:46 +0000)
committer GitHub <noreply@github.com>
Thu, 10 Dec 2020 23:46:06 +0000 (23:46 +0000)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc tests/phpunit/CRMTraits/Financial/OrderTrait.php
Simple merge
diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge
diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge
author	Matthew Wire <mjw@mjwconsult.co.uk>
	Thu, 10 Dec 2020 23:46:06 +0000 (23:46 +0000)
committer	GitHub <noreply@github.com>
	Thu, 10 Dec 2020 23:46:06 +0000 (23:46 +0000)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRMTraits/Financial/OrderTrait.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviUnitTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history