Merge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates

author Seamus Lee <seamuslee001@gmail.com>

Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)

committer GitHub <noreply@github.com>

Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)
author Seamus Lee <seamuslee001@gmail.com>
Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)
committer GitHub <noreply@github.com>
Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)
diff --cc tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
Simple merge
diff --cc tests/phpunit/api/v3/PaymentTest.php
Simple merge
diff --cc xml/templates/message_templates/contribution_online_receipt_html.tpl
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)
committer	GitHub <noreply@github.com>
	Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)
		1	2
tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/PaymentTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
xml/templates/message_templates/contribution_online_receipt_html.tpl	patch \|	diff1 \|	diff2 \|	blob \| history