aboutsummaryrefslogtreecommitdiffstats
path: root/core/hostmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-07-04 23:05:27 +0200
committerKim Alvefur <zash@zash.se>2014-07-04 23:05:27 +0200
commit4ee00880c225db985b26614eeb0b3d0d39487c99 (patch)
tree41f4db74c0b05563f71d07478a4d8b3c106359af /core/hostmanager.lua
parent6c75e23434fd4ba3eed580582ade3ad8337fd585 (diff)
parent260fc78e4095f1e4ed74d4e76dc1eb23713bacf1 (diff)
downloadprosody-4ee00880c225db985b26614eeb0b3d0d39487c99.tar.gz
prosody-4ee00880c225db985b26614eeb0b3d0d39487c99.zip
Merge 0.10->trunk
Diffstat (limited to 'core/hostmanager.lua')
-rw-r--r--core/hostmanager.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 91b052d1..d10ecd30 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -74,7 +74,6 @@ function activate(host, host_config)
host = host;
s2sout = {};
events = events_new();
- dialback_secret = configmanager.get(host, "dialback_secret") or uuid_gen();
send = host_send;
modules = {};
};