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-2015-02-02-18-36-16
[civicrm-core.git]
/
settings
/
Url.setting.php
diff --git
a/settings/Url.setting.php
b/settings/Url.setting.php
index baf0cc6aadf002752696e334f7ae09f9741be47f..eb8b33b25f972ffcc8f6ac78a96f8c02cee46013 100644
(file)
--- a/
settings/Url.setting.php
+++ b/
settings/Url.setting.php
@@
-23,7
+23,7
@@
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
-*/
+
*/
/**
*