From 50922784c5d6b5206a830c73b467e1551f4cda5c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 03 May 2016 09:14:18 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

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

diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
index febb3ba..585332f 100644
--- a/interface/web/admin/lib/lang/hr_server_php.lng
+++ b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -14,5 +14,3 @@
 $wb['php_fpm_ini_dir_txt'] = 'Putanja do php.ini direktorija';
 $wb['php_fpm_pool_dir_txt'] = 'Putanja do PHP-FPM pool direktorija';
 ?>
-
-

--
Gitblit v1.9.1