Diff

prosodyctl @ 10039:e90c9857a880

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 31 May 2019 00:04:05 +0200
parent 9992:9d6baacdd8e6
child 10064:1acfd25cd507
child 10122:95814c597836
line wrap: on
line diff