projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03
[civicrm-core.git]
/
CRM
/
Contact
/
Import
/
ImportJob.php
diff --git
a/CRM/Contact/Import/ImportJob.php
b/CRM/Contact/Import/ImportJob.php
index 797c6d23f69518e1c7a29467a4cb19f9e5b0ca85..ffb58217c4a7434baab34d8279e499e131042a20 100644
(file)
--- a/
CRM/Contact/Import/ImportJob.php
+++ b/
CRM/Contact/Import/ImportJob.php
@@
-339,7
+339,7
@@
class CRM_Contact_Import_ImportJob {
/**
* @param $contactIds
- * @param $newGroupName
+ * @param
string
$newGroupName
* @param $newGroupDesc
*
* @return array|bool
@@
-392,7
+392,7
@@
class CRM_Contact_Import_ImportJob {
/**
* @param $contactIds
- * @param $newTagName
+ * @param
string
$newTagName
* @param $newTagDesc
*
* @return array|bool