From 6a00b4e599f724cbc9a12927c8a0446ef5621028 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 23 Dec 2015 12:21:09 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

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

diff --git a/interface/web/admin/lib/lang/ru_server_config_list.lng b/interface/web/admin/lib/lang/ru_server_config_list.lng
index 351caaf..c0afd83 100644
--- a/interface/web/admin/lib/lang/ru_server_config_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_config_list.lng
@@ -2,4 +2,3 @@
 $wb['list_head_txt'] = 'Настройки сервера';
 $wb['server_name_txt'] = 'Сервер';
 ?>
-

--
Gitblit v1.9.1