Diff

prosodyctl @ 8410:54ff1f91e4db

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 21 Nov 2017 23:16:16 +0100
parent 8285:433b2a41351f
child 8440:4e6710b4f873
line wrap: on
line diff