Diff

prosodyctl @ 8828:2a0d7fa4c56a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 May 2018 03:33:13 +0200
parent 8787:5dbebb7627ef
child 8882:a420b386a72a
line wrap: on
line diff