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

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

diff --git a/interface/web/admin/lib/lang/ru_language_edit.lng b/interface/web/admin/lib/lang/ru_language_edit.lng
index b5cbb16..3a92ac2 100644
--- a/interface/web/admin/lib/lang/ru_language_edit.lng
+++ b/interface/web/admin/lib/lang/ru_language_edit.lng
@@ -6,4 +6,3 @@
 $wb['btn_save_txt'] = 'Сохранить';
 $wb['btn_cancel_txt'] = 'Назад';
 ?>
-

--
Gitblit v1.9.1