Diff

prosodyctl @ 8888:cbcac5b9b7ce

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Jun 2018 16:15:32 +0200
parent 8882:a420b386a72a
child 8917:d4c98115e00c
line wrap: on
line diff