From b4263138f9632d3a9c098a9e6ad1fdccee03fcc9 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:18:41 -0500
Subject: [PATCH] Merge branch 'dns-dnssec' of git.ispconfig.org:darkalex/ispconfig3 into dns-dnssec

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

diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
index 3b6096e..addbfa4 100644
--- a/interface/web/admin/lib/lang/el_server_php.lng
+++ b/interface/web/admin/lib/lang/el_server_php.lng
@@ -14,4 +14,3 @@
 $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
 ?>
-

--
Gitblit v1.9.1