Diff

prosodyctl @ 10778:a62b981db0e2

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 Apr 2020 20:49:31 +0200
parent 10629:eed5811941b2
child 10858:efa49d484560
line wrap: on
line diff