Merge pull request #12508 from civicrm/5.4
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 18 Jul 2018 12:58:32 +0000 (00:58 +1200)
committerGitHub <noreply@github.com>
Wed, 18 Jul 2018 12:58:32 +0000 (00:58 +1200)
5.4 to master

1  2 
CRM/Contribute/BAO/Contribution.php

Simple merge