From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/web/admin/templates/system_config_mail_edit.htm | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 3c8cf2b..e9c0c0e 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -12,6 +12,24 @@
</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'}
@@ -77,4 +95,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
--
Gitblit v1.9.1