Diff

prosodyctl @ 8150:4720f5ec4171

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 20 May 2017 15:00:50 +0200
parent 8146:5c91fb62338e
child 8153:c22d5680ca68
line wrap: on
line diff