Diff

prosodyctl @ 10948:bebb384090b0

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 23 Jun 2020 15:17:35 +0200
parent 10905:709255e332d8
child 10964:d6a3d652ca32
line wrap: on
line diff