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)
5.5

1  2 
CRM/Activity/BAO/Activity.php

Simple merge