Diff

prosodyctl @ 8415:e1b05f9c1ea5

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