Diff

util/prosodyctl.lua @ 8165:e564f13b9582

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 13 Jun 2017 16:38:53 +0200
parent 8123:bd591c5fc1bf
child 8634:f6f62c92b642
line wrap: on
line diff