Diff

prosodyctl @ 8731:6063f9211fd1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 06 Apr 2018 01:43:44 +0200
parent 8718:c23cdeac5b61
child 8787:5dbebb7627ef
line wrap: on
line diff