Diff

prosodyctl @ 8467:7269313c1324

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 09 Dec 2017 15:40:37 +0100
parent 8440:4e6710b4f873
child 8561:7b9ffddc4276
line wrap: on
line diff