comparison util/prosodyctl.lua @ 9598:dcd85bc34d21

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 30 Oct 2018 19:18:03 +0100
parents 3f975bbfec3b
children 161411a41377 6e46fefe956c
comparison
equal deleted inserted replaced
9596:b148dd7e78e3 9598:dcd85bc34d21