Diff

prosodyctl @ 8234:97b3ca502547

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 14 Sep 2017 02:47:40 +0200
parent 8202:85a60e863509
child 8203:a7863f4aae65
child 8247:2c386ee5cd5c
line wrap: on
line diff