Diff

prosodyctl @ 8480:3d3706147174

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 22 Dec 2017 01:02:05 +0100 (2017-12-22)
parent 8440:4e6710b4f873
child 8561:7b9ffddc4276
line wrap: on
line diff