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/admin/lib/lang/de_server_php.lng |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
index 30f527a..9b26ea3 100644
--- a/interface/web/admin/lib/lang/de_server_php.lng
+++ b/interface/web/admin/lib/lang/de_server_php.lng
@@ -14,4 +14,3 @@
 $wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
 $wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis';
 ?>
-

--
Gitblit v1.9.1