From e2a219e2971cbbc048c34470e435df4eea752a82 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 29 Jun 2016 05:27:58 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

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

diff --git a/interface/web/admin/lib/lang/ru_language_complete.lng b/interface/web/admin/lib/lang/ru_language_complete.lng
index c7ade3c..ba6bc36 100644
--- a/interface/web/admin/lib/lang/ru_language_complete.lng
+++ b/interface/web/admin/lib/lang/ru_language_complete.lng
@@ -5,4 +5,3 @@
 $wb['btn_cancel_txt'] = 'Назад';
 $wb['list_desc_txt'] = 'Объеденить выбранный язык с английским мастер-языком. <br />Это добавит пропущенные строки из мастер-языка.';
 ?>
-

--
Gitblit v1.9.1