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 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
[civicrm-core.git]
/
templates
/
CRM
/
Admin
/
Form
/
Preferences
/
Mailing.tpl
diff --git
a/templates/CRM/Admin/Form/Preferences/Mailing.tpl
b/templates/CRM/Admin/Form/Preferences/Mailing.tpl
index 10c8413910962d413eb9995e1e9e25fc247bb513..4faace4ca0f50e339bd4402faa6ddc33ff95a625 100644
(file)
--- a/
templates/CRM/Admin/Form/Preferences/Mailing.tpl
+++ b/
templates/CRM/Admin/Form/Preferences/Mailing.tpl
@@
-1,8
+1,8
@@
{*
+--------------------------------------------------------------------+
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
5
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |