Diff

prosodyctl @ 8497:b703f56b8194

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 29 Dec 2017 20:50:07 +0100
parent 8440:4e6710b4f873
child 8561:7b9ffddc4276
line wrap: on
line diff