Diff

prosodyctl @ 9281:927adf8648d3

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Sep 2018 11:51:52 +0200
parent 9231:3d12b4f41b23
child 9545:9dc7280dd8dc
line wrap: on
line diff