From 178258f86cdf00b9c047023b97937c794bac88ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 29 Sep 2014 13:00:54 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/admin/templates/server_config_mail_edit.htm |    8 ++++++++
 1 files changed, 8 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 2bf8f93..d21df15 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -24,6 +24,14 @@
                 <input name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" size="40" maxlength="255" type="text" class="textInput" />
             </div>
             <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='dkim_strength_txt'}</p>
+				<div class="multiField">
+					<select name="dkim_strength" id="dkim_strength" class="selectInput">
+						{tmpl_var name='dkim_strength'}
+					</select>
+				</div>
+			</div>
+            <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='pop3_imap_daemon_txt'}</p>
                 <div class="multiField">
                     <select name="pop3_imap_daemon" id="pop3_imap_daemon" class="selectInput">

--
Gitblit v1.9.1