From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/web/admin/templates/system_config_mail_edit.htm | 20 +-------------------
1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index e9c0c0e..3c8cf2b 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -12,24 +12,6 @@
</div>
</div>
<div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</p>
- <div class="multiField">
- {tmpl_var name='mailbox_show_autoresponder_tab'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_show_mail_filter_tab_txt'}</p>
- <div class="multiField">
- {tmpl_var name='mailbox_show_mail_filter_tab'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_show_custom_rules_tab_txt'}</p>
- <div class="multiField">
- {tmpl_var name='mailbox_show_custom_rules_tab'}
- </div>
- </div>
- <div class="ctrlHolder">
<p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
<div class="multiField">
{tmpl_var name='mailboxlist_webmail_link'}
@@ -95,4 +77,4 @@
</div>
</div>
-</div>
+</div>
\ No newline at end of file
--
Gitblit v1.9.1