From dad105ff4110e29a584af3e5dc75c0f3cfcd0dce Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 29 Feb 2016 14:25:26 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

diff --git a/interface/web/admin/lib/lang/hr_server_php_list.lng b/interface/web/admin/lib/lang/hr_server_php_list.lng
index b763dcc..8fd3db7 100644
--- a/interface/web/admin/lib/lang/hr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_php_list.lng
@@ -5,5 +5,3 @@
 $wb['client_id_txt'] = 'Klijent';
 $wb['name_txt'] = 'PHP Name';
 ?>
-
-

--
Gitblit v1.9.1