projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #4892 from colemanw/INFRA-132
[civicrm-core.git]
/
CRM
/
Activity
/
Import
/
Controller.php
diff --git
a/CRM/Activity/Import/Controller.php
b/CRM/Activity/Import/Controller.php
index 92bbf076487d9ffc8d94bf5e1b4b2f0ee9048c77..e838df67b5b73d0f2a150d25991aed40709dedb2 100644
(file)
--- a/
CRM/Activity/Import/Controller.php
+++ b/
CRM/Activity/Import/Controller.php
@@
-55,4
+55,3
@@
class CRM_Activity_Import_Controller extends CRM_Core_Controller {
$this->addActions($config->uploadDir, array('uploadFile'));
}
}
-