Diff

prosodyctl @ 8518:0de0018bdf91

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 04 Feb 2018 01:40:11 +0100
parent 8440:4e6710b4f873
child 8561:7b9ffddc4276
line wrap: on
line diff