diff options
author | Kim Alvefur <zash@zash.se> | 2014-07-04 23:05:27 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-07-04 23:05:27 +0200 |
commit | 470aca805a23e9483bacd3a9864295c1baecbd65 (patch) | |
tree | 41f4db74c0b05563f71d07478a4d8b3c106359af /core/hostmanager.lua | |
parent | e747fa644137819e46e444b8ca605c727fa64d97 (diff) | |
parent | c09c7687017547b4fcff673e80944ea5d5167853 (diff) | |
download | prosody-470aca805a23e9483bacd3a9864295c1baecbd65.tar.gz prosody-470aca805a23e9483bacd3a9864295c1baecbd65.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/hostmanager.lua')
-rw-r--r-- | core/hostmanager.lua | 1 |
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 = {}; }; |