Diff

prosodyctl @ 8270:8b470cf497b7

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 26 Sep 2017 17:49:20 +0100
parent 8268:e21d82551e05
child 8285:433b2a41351f
line wrap: on
line diff