Diff

prosodyctl @ 8920:2eaa442d81a6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 22 Jun 2018 14:18:36 +0200
parent 8917:d4c98115e00c
child 8923:ddd98e262519
line wrap: on
line diff