Diff

prosodyctl @ 9790:4a419089ad00

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 17 Jan 2019 01:09:38 +0100
parent 9782:d844e197eedf
child 9794:4b5c24f13d4a
line wrap: on
line diff