Diff

prosodyctl @ 8235:7d9a2c200736

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 14 Sep 2017 02:48:34 +0200
parent 8203:a7863f4aae65
child 8253:3a6f5b0f56f0
line wrap: on
line diff