From e79795fb3f2f9e380b89374a1bfeda2e6034d236 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 19 Apr 2016 13:54:05 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

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

diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index 54d0ef2..298eca6 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -14,4 +14,3 @@
 $wb['php_fpm_ini_dir_txt'] = 'Ścieżka do katalogu php.ini';
 $wb['php_fpm_pool_dir_txt'] = 'Ścieżka do katalogu pool PHP-FPM';
 ?>
-

--
Gitblit v1.9.1