Merge pull request #13184 from civicrm/5.8

author Eileen McNaughton <eileen@mcnaughty.com>

Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)

committer GitHub <noreply@github.com>

Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)
author Eileen McNaughton <eileen@mcnaughty.com>
Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)
committer GitHub <noreply@github.com>
Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)
committer	GitHub <noreply@github.com>
	Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history