Merge pull request #16715 from mattwire/cancelsubscriptiongeneratetext

author Eileen McNaughton <emcnaughton@wikimedia.org>

Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)

committer GitHub <noreply@github.com>

Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)
committer GitHub <noreply@github.com>
Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)
diff --cc CRM/Contribute/Form/CancelSubscription.php
Simple merge
diff --cc CRM/Core/Payment.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)
committer	GitHub <noreply@github.com>
	Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)
		1	2
CRM/Contribute/Form/CancelSubscription.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/Payment.php	patch \|	diff1 \|	diff2 \|	blob \| history