Diff

prosodyctl @ 8456:891239e7e896

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 05 Dec 2017 12:26:08 +0100
parent 8440:4e6710b4f873
child 8561:7b9ffddc4276
line wrap: on
line diff