Merge pull request #10837 from civicrm/4.7.24-rc

author Eileen McNaughton <eileen@mcnaughty.com>

Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)

committer GitHub <noreply@github.com>

Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)
author Eileen McNaughton <eileen@mcnaughty.com>
Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)
committer GitHub <noreply@github.com>
Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
Simple merge
diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)
committer	GitHub <noreply@github.com>
	Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history