Diff

prosodyctl @ 10521:cbb2c3f8bb1d

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 23 Dec 2019 20:57:10 +0100
parent 10434:8f709577fe8e
child 10579:16099e8964d8
line wrap: on
line diff