Diff

prosodyctl @ 10568:b6f93babebe8

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 24 Dec 2019 01:21:58 +0100
parent 10434:8f709577fe8e
child 10579:16099e8964d8
line wrap: on
line diff