From 8507b06fe08157012d6e14c4c160e685fabc0b9a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 03:57:17 -0500
Subject: [PATCH] Merge branch 'vmailuid' of /home/git/repositories/renky/ispconfig3

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

diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 6ab03eb..991f1b0 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -56,6 +56,12 @@
                 <input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
             </div>
             <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailbox_virtual_uidgid_maps'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
                 <label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
                 <input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
             </div>

--
Gitblit v1.9.1