Diff

prosodyctl @ 8906:f15e35458ecc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Jun 2018 01:20:05 +0200
parent 8882:a420b386a72a
child 8917:d4c98115e00c
line wrap: on
line diff