From 1e33ee2d84585ce7e4eefd442c7f5726128f8177 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 06 Apr 2016 12:50:55 -0400
Subject: [PATCH] Merge branch '3817-AddClientIdResellerToken' into 'stable-3.1'

---
 interface/web/tools/lib/lang/it_import_ispconfig.lng |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/interface/web/tools/lib/lang/it_import_ispconfig.lng b/interface/web/tools/lib/lang/it_import_ispconfig.lng
index 65ea145..ce47c4d 100644
--- a/interface/web/tools/lib/lang/it_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/it_import_ispconfig.lng
@@ -20,5 +20,4 @@
 $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Import user filter';
 $wb['import_spamfilter_txt'] = 'Import spamfilter';
-
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1