Diff

prosodyctl @ 10058:08c6540f5a65

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Jun 2019 22:26:46 +0200
parent 9992:9d6baacdd8e6
child 10064:1acfd25cd507
child 10122:95814c597836
line wrap: on
line diff