Diff

prosodyctl @ 10037:e01f38acde74

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 30 May 2019 21:44:35 +0200
parent 9992:9d6baacdd8e6
child 10064:1acfd25cd507
child 10122:95814c597836
line wrap: on
line diff