From 69fe1ea229e5d2c3a6ecc3fc3c5438790bfc8b05 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 23 Dec 2015 12:27:11 -0500
Subject: [PATCH] Merge branch 'jnorell/ispconfig3-master'

---
 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