Diff

prosodyctl @ 8390:4c629fde768c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 Nov 2017 17:47:50 +0100
parent 8285:433b2a41351f
child 8440:4e6710b4f873
line wrap: on
line diff