Diff

prosodyctl @ 7191:df4f52cabdfe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Feb 2016 11:20:00 +0100
parent 7147:81e54032d14d
parent 7190:7a14ea196db3
child 7195:39b7ea9141c0
line wrap: on
line diff
--- a/prosodyctl	Mon Feb 22 18:46:59 2016 +0100
+++ b/prosodyctl	Wed Feb 24 11:20:00 2016 +0100
@@ -233,6 +233,7 @@
 		type = "local",
 		events = prosody.events,
 		modules = {},
+		sessions = {},
 		users = require "core.usermanager".new_null_provider(hostname)
 	};
 end