Merge pull request #11441 from civicrm/4.7.29-rc

author Eileen McNaughton <eileen@mcnaughty.com>

Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)

committer GitHub <noreply@github.com>

Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)
author Eileen McNaughton <eileen@mcnaughty.com>
Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)
committer GitHub <noreply@github.com>
Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)
diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge
diff --cc CRM/Contribute/Form/ContributionBase.php
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)
committer	GitHub <noreply@github.com>
	Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)
		1	2
CRM/Contribute/Form/Contribution/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionBase.php	patch \|	diff1 \|	diff2 \|	blob \| history