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.4' into 4.4-master-2014-04-21-08-12-12
[civicrm-core.git]
/
api
/
v3
/
ActivityType.php
diff --git
a/api/v3/ActivityType.php
b/api/v3/ActivityType.php
index 50247e792ceac1f8524784cdc8e454462bd2b560..273ff8959de5440ed9eb229497099464bf69b3e6 100644
(file)
--- a/
api/v3/ActivityType.php
+++ b/
api/v3/ActivityType.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-34,7
+34,7
@@
* @package CiviCRM_APIv3
* @subpackage API_Activity
*
* @package CiviCRM_APIv3
* @subpackage API_Activity
*
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id: ActivityType.php 30171 2010-10-14 09:11:27Z mover $
*
*/
* $Id: ActivityType.php 30171 2010-10-14 09:11:27Z mover $
*
*/