Diff

prosodyctl @ 9136:07fc2c5c0c2e

Merge jonasw->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Aug 2018 16:58:21 +0200
parent 8948:3be8799263f3
child 9231:3d12b4f41b23
line wrap: on
line diff