Merge branch 'master' into 4.7.19-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 26 Apr 2017 04:29:29 +0000 (16:29 +1200)
committerGitHub <noreply@github.com>
Wed, 26 Apr 2017 04:29:29 +0000 (16:29 +1200)
commitc85b067db283912cf2bcf91123c1fc675716c998
tree4ad72068938f1c2a3a22e814bb8434365a12c65c
parent881d82e54ea261f4f8df18219765892289d56cee
parent391f7656a1b4ae591854d6a225a447f4f23e48a4
Merge branch 'master' into 4.7.19-rc
CRM/Activity/BAO/Activity.php
tests/phpunit/CRM/Activity/BAO/ActivityTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php