Merge branch '4.7.29-rc' of https://github.com/civicrm/civicrm-core into merge
authoreileen <emcnaughton@wikimedia.org>
Mon, 18 Dec 2017 22:38:37 +0000 (11:38 +1300)
committereileen <emcnaughton@wikimedia.org>
Mon, 18 Dec 2017 22:38:37 +0000 (11:38 +1300)
commit9a5929a960058f9ef2df1f094da9ffe387900cd8
tree392fb411c289b3b318690b282a59ebed17f29545
parent9daff80e1759d0d6b8503b923feead26a1487195
parentd94349dc19278744382d958ecead65a48451b493
Merge branch '4.7.29-rc' of https://github.com/civicrm/civicrm-core into merge

Change-Id: I1565e0bf1c32956d29bb56107b3f3eb57485d1f9
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Price/BAO/LineItem.php
CRM/Utils/Rule.php
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
tests/phpunit/CRM/Member/Form/MembershipTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ContributionTest.php