Diff

prosodyctl @ 8539:41b5f070d7bb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 24 Feb 2018 11:51:43 +0100
parent 8440:4e6710b4f873
child 8561:7b9ffddc4276
line wrap: on
line diff