Merge pull request #12995 from eileenmcnaughton/activity_extract2

author colemanw <coleman@civicrm.org>

Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)

committer GitHub <noreply@github.com>

Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)
author colemanw <coleman@civicrm.org>
Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)
committer GitHub <noreply@github.com>
Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)
diff --cc CRM/Activity/BAO/Activity.php
Simple merge
diff --cc tests/phpunit/api/v3/ACLPermissionTest.php
Simple merge
author	colemanw <coleman@civicrm.org>
	Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)
committer	GitHub <noreply@github.com>
	Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)
		1	2
CRM/Activity/BAO/Activity.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ACLPermissionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history