Diff

prosodyctl @ 8992:972b6f793ff9

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 07 Jul 2018 21:00:59 +0200
parent 8948:3be8799263f3
child 9231:3d12b4f41b23
line wrap: on
line diff