From a549793dccc43cbbd47b40fb339c1a1c37cbc6e6 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 14 Dec 2014 07:11:11 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

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

diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 1ea5255..c4079bf 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -161,6 +161,14 @@
                         {tmpl_var name='enable_sni'}
                     </div>
                 </div>
+				<div class="ctrlHolder">
+					<p class="label">
+						<tmpl_var name="enable_spdy_txt">
+					</p>
+					<div class="multiField">
+						<tmpl_var name="enable_spdy">
+					</div>
+				</div>
                 <div class="ctrlHolder">
                     <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
                     <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput" />

--
Gitblit v1.9.1