Merge pull request #10640 from mattwire/CRM-20772_showtaxterm

author Monish Deb <monish.deb@jmaconsulting.biz>

Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)

committer GitHub <noreply@github.com>

Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)
author Monish Deb <monish.deb@jmaconsulting.biz>
Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)
committer GitHub <noreply@github.com>
Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)
diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge
diff --cc CRM/Price/BAO/LineItem.php
Simple merge
diff --cc templates/CRM/Contribute/Form/Contribution.tpl
Simple merge
diff --cc templates/CRM/Contribute/Form/Contribution/Confirm.tpl
Simple merge
author	Monish Deb <monish.deb@jmaconsulting.biz>
	Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)
committer	GitHub <noreply@github.com>
	Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)
		1	2
CRM/Contribute/Form/Contribution/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/LineItem.php	patch \|	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution/Confirm.tpl	patch \|	diff1 \|	diff2 \|	blob \| history