Diff

prosodyctl @ 10656:ffa9a20aca8b

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 22 Feb 2020 16:26:20 +0100
parent 10629:eed5811941b2
child 10858:efa49d484560
line wrap: on
line diff