Software / code / prosody
Diff
prosodyctl @ 6791:e813e8cf6046
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Aug 2015 13:05:22 +0200 |
| parent | 6784:4da860edc27c |
| child | 6837:13b44929ae49 |
line wrap: on
line diff
--- a/prosodyctl Mon Aug 17 01:58:53 2015 +0200 +++ b/prosodyctl Thu Aug 20 13:05:22 2015 +0200 @@ -244,7 +244,7 @@ local modulemanager = require "core.modulemanager" local prosodyctl = require "util.prosodyctl" -require "socket" +local socket = require "socket" ----------------------- -- FIXME: Duplicate code waiting for util.startup
