Diff

prosodyctl @ 10683:2f0b7f1d5e75

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 11 Mar 2020 22:44:41 +0100
parent 10629:eed5811941b2
child 10858:efa49d484560
line wrap: on
line diff