Diff

prosodyctl @ 11587:ce7c52a6d650

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 27 May 2021 12:51:07 +0200
parent 11582:a3d48204ec95
parent 11586:35e880501efd
child 11690:4e36a1e7222b
line wrap: on
line diff