Diff

prosodyctl @ 8581:f7c397935872

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 09 Mar 2018 22:17:59 +0100
parent 8561:7b9ffddc4276
child 8635:47e3b8b6f17a
line wrap: on
line diff