Merge pull request #7095 from mjwright/online-pledge-payment-fix

author Yashodha Chaku <yashodha.chaku@webaccessglobal.com>

Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)

committer Yashodha Chaku <yashodha.chaku@webaccessglobal.com>

Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)
author Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)
committer Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)
diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge
diff --cc CRM/Contribute/Form/Contribution/Main.php
Simple merge
diff --cc templates/CRM/Contribute/Form/Contribution/Main.tpl
Simple merge
author	Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
	Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)
committer	Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
	Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)
		1	2
CRM/Contribute/Form/Contribution/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Main.php	patch \|	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution/Main.tpl	patch \|	diff1 \|	diff2 \|	blob \| history