Diff

prosodyctl @ 12511:a24d2b3c19a3

Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 16 May 2022 14:51:58 +0200 (2022-05-16)
parent 12452:c475a7802169
child 12578:10bb58ad5583
child 12863:891edd1ebde6
line wrap: on
line diff