From 498c86fbbfc4aa034758693309dd97b7ca4ef4f0 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 26 May 2016 12:17:26 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/mailuser/lib/lang/de_mail_user_cc.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
index cfb1ab3..e43d39c 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
@@ -6,4 +6,4 @@
 $wb['email_is_cc_error'] = 'E-Mail Adresse und ';
 $wb['name_optional_txt'] = '(optional)';
 $wb['cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1