Merge pull request #9390 from eileenmcnaughton/members

author Eileen McNaughton <eileen@mcnaughty.com>

Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)

committer GitHub <noreply@github.com>

Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)
author Eileen McNaughton <eileen@mcnaughty.com>
Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)
committer GitHub <noreply@github.com>
Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge
diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)
committer	GitHub <noreply@github.com>
	Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history