Merge pull request #12657 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 14 Aug 2018 00:23:09 +0000 (12:23 +1200)
committerGitHub <noreply@github.com>
Tue, 14 Aug 2018 00:23:09 +0000 (12:23 +1200)
commit28a1c87b4cc6a4a2e616fc57bd50d526624106e9
tree8a136f1fc7a69d7c58e012ead38a3db732e7404b
parent7432a41c4cccb22ab035aea2c5ed4780617f3676
parent5fce4a2311ce8495eca70bd68905b533723cb029
Merge pull request #12657 from civicrm/5.5

5.5
CRM/Activity/BAO/Activity.php