From 8cad78372e31c0f9c06be4654fbf59d85ef11f0e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 03:41:19 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

---
 interface/web/admin/templates/server_config_rescue_edit.htm |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm
index 8bb9e3b..435449b 100644
--- a/interface/web/admin/templates/server_config_rescue_edit.htm
+++ b/interface/web/admin/templates/server_config_rescue_edit.htm
@@ -17,12 +17,14 @@
                     {tmpl_var name='do_not_try_rescue_httpd'}
                 </div>
             </div>
+<!--
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</label>
                 <div class="col-sm-9">
                     {tmpl_var name='do_not_try_rescue_mongodb'}
                 </div>
             </div>
+-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mysql_txt'}</label>
                 <div class="col-sm-9">

--
Gitblit v1.9.1