diff options
| author | Kim Alvefur <zash@zash.se> | 2015-08-20 13:05:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-08-20 13:05:22 +0200 |
| commit | 6ef7c4d80892f486d71e660b054bdfdb993c8528 (patch) | |
| tree | 103fd7d9396b60b9f76071a009c54d3ca9d35744 /prosodyctl | |
| parent | a9029bd099734436154fc4e794d3b958e54d1943 (diff) | |
| parent | d32f36b2817739d7f8d5f1208a3009b7be379562 (diff) | |
| download | prosody-6ef7c4d80892f486d71e660b054bdfdb993c8528.tar.gz prosody-6ef7c4d80892f486d71e660b054bdfdb993c8528.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
| -rwxr-xr-x | prosodyctl | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -244,7 +244,7 @@ end local modulemanager = require "core.modulemanager" local prosodyctl = require "util.prosodyctl" -require "socket" +local socket = require "socket" ----------------------- -- FIXME: Duplicate code waiting for util.startup |