prosody
e813e8cf6046
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

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
comparison
equal deleted inserted replaced
6776:4412a2307c89 6791:e813e8cf6046
242 end 242 end
243 243
244 local modulemanager = require "core.modulemanager" 244 local modulemanager = require "core.modulemanager"
245 245
246 local prosodyctl = require "util.prosodyctl" 246 local prosodyctl = require "util.prosodyctl"
247 require "socket" 247 local socket = require "socket"
248 ----------------------- 248 -----------------------
249 249
250 -- FIXME: Duplicate code waiting for util.startup 250 -- FIXME: Duplicate code waiting for util.startup
251 function read_version() 251 function read_version()
252 -- Try to determine version 252 -- Try to determine version