Diff

prosodyctl @ 8369:e08a0ff6ce14

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