Merge pull request #14557 from civicrm/5.15
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 16 Jun 2019 13:55:07 +0000 (09:55 -0400)
committerGitHub <noreply@github.com>
Sun, 16 Jun 2019 13:55:07 +0000 (09:55 -0400)
5.15 to master

1  2 
CRM/Activity/Form/Activity.php

Simple merge