Diff

prosodyctl @ 8902:ac21f13798ae

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 09 Jun 2018 15:47:59 +0200 (2018-06-09)
parent 8882:a420b386a72a
child 8917:d4c98115e00c
line wrap: on
line diff