diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-24 11:20:00 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-24 11:20:00 +0100 |
commit | 85fba1e8697d6fb0508303d866181b8b277f05d6 (patch) | |
tree | 60121c160143098d7d661c2dcafd57af5c4ea5de /prosodyctl | |
parent | 9dd235d53bbb77efa67543e0057d093789ca2ddd (diff) | |
parent | fe1e9e84e64e143037615685661047c6270763ed (diff) | |
download | prosody-85fba1e8697d6fb0508303d866181b8b277f05d6.tar.gz prosody-85fba1e8697d6fb0508303d866181b8b277f05d6.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
-rwxr-xr-x | prosodyctl | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -233,6 +233,7 @@ local function make_host(hostname) type = "local", events = prosody.events, modules = {}, + sessions = {}, users = require "core.usermanager".new_null_provider(hostname) }; end |