From 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 12 Feb 2016 11:06:02 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/tools/lib/lang/el_import_ispconfig.lng |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/interface/web/tools/lib/lang/el_import_ispconfig.lng b/interface/web/tools/lib/lang/el_import_ispconfig.lng
index 1723c16..ce47c4d 100644
--- a/interface/web/tools/lib/lang/el_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/el_import_ispconfig.lng
@@ -21,4 +21,3 @@
 $wb['import_user_filter_txt'] = 'Import user filter';
 $wb['import_spamfilter_txt'] = 'Import spamfilter';
 ?>
-

--
Gitblit v1.9.1