Diff

prosodyctl @ 11378:b790df8f9448

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 15 Feb 2021 22:30:28 +0100
parent 11301:d7f0dc727a47
child 11560:3bbb1af92514
line wrap: on
line diff