Merge pull request #28868 from civicrm/5.69

author Eileen McNaughton <emcnaughton@wikimedia.org>

Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)

committer GitHub <noreply@github.com>

Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)
committer GitHub <noreply@github.com>
Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)
diff --cc CRM/Contribute/Form/ContributionBase.php
Simple merge
diff --cc CRM/Financial/BAO/Order.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)
committer	GitHub <noreply@github.com>
	Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)
		1	2
CRM/Contribute/Form/ContributionBase.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/Order.php	patch \|	diff1 \|	diff2 \|	blob \| history