From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
index aca706a..4a648f4 100644
--- a/interface/web/admin/templates/server_edit_services.htm
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -45,6 +45,12 @@
                 </div>
             </div>
             <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='xmpp_server_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='xmpp_server'}
+                </div>
+            </div>
+            <div class="form-group">
                 <label for="mirror_server_id" class="col-sm-3 control-label">{tmpl_var name='mirror_server_id_txt'}</label>
                 <div class="col-sm-9"><select name="mirror_server_id" id="server_id" class="form-control">
                     {tmpl_var name='mirror_server_id'}

--
Gitblit v1.9.1