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-06-30-11-58-01
[civicrm-core.git]
/
api
/
v3
/
Setting.php
diff --git
a/api/v3/Setting.php
b/api/v3/Setting.php
index 38eeb3e7225b522eb5d4cf75d0c82846088ff68f..9f71c5ab362f479b25a2acb220e1736857d7739c 100644
(file)
--- a/
api/v3/Setting.php
+++ b/
api/v3/Setting.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | 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. |
| |
@@
-30,7
+30,7
@@
*
* @package CiviCRM_APIv3_Core
* @subpackage API_Settings
*
* @package CiviCRM_APIv3_Core
* @subpackage API_Settings
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* @version $Id: Settings.php
*
*/
* @version $Id: Settings.php
*
*/