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'
---
server/mods-available/xmpp_module.inc.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/server/mods-available/xmpp_module.inc.php b/server/mods-available/xmpp_module.inc.php
index f8c1526..aace256 100644
--- a/server/mods-available/xmpp_module.inc.php
+++ b/server/mods-available/xmpp_module.inc.php
@@ -112,7 +112,6 @@
// load the server configuration options
$app->uses('getconf,system');
- $xmpp_config = $app->getconf->get_server_config($conf['server_id'], 'xmpp');
$daemon = 'metronome';
--
Gitblit v1.9.1