From 8c6a4706f8bf375738197ed83d1f91d8a17032ef Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/admin/lib/lang/hr_tpl_default_admin.lng b/interface/web/admin/lib/lang/hr_tpl_default_admin.lng
index a28c517..34ddda1 100644
--- a/interface/web/admin/lib/lang/hr_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/hr_tpl_default_admin.lng
@@ -16,5 +16,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