Merge pull request #22780 from civicrm/5.47

author Eileen McNaughton <emcnaughton@wikimedia.org>

Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)

committer GitHub <noreply@github.com>

Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)
committer GitHub <noreply@github.com>
Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc CRM/Contribute/BAO/ContributionRecur.php
Simple merge
diff --cc xml/schema/Contribute/ContributionRecur.xml
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)
committer	GitHub <noreply@github.com>
	Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/ContributionRecur.php	patch \|	diff1 \|	diff2 \|	blob \| history
xml/schema/Contribute/ContributionRecur.xml	patch \|	diff1 \|	diff2 \|	blob \| history