Merge branch '5.4' of https://github.com/civicrm/civicrm-core
authoreileen <emcnaughton@wikimedia.org>
Wed, 18 Jul 2018 22:53:14 +0000 (10:53 +1200)
committereileen <emcnaughton@wikimedia.org>
Wed, 18 Jul 2018 22:53:28 +0000 (10:53 +1200)
commitf2e37338c8a8779f70020dedcb6edcd378f3ad29
tree7a5a244badbef7dea3adfa17cf417b7d7434f884
parent8b58a98f17b65d4e5c67f973b66ebb1b4df3615a
parent6a4b27dd57f95dbbf1101a5c1e2cdcf6c9db5404
Merge branch '5.4' of https://github.com/civicrm/civicrm-core
CRM/Activity/Form/Activity.php
CRM/Activity/Page/Tab.php
CRM/Report/Form/Activity.php