Diff

prosodyctl @ 9646:eb543e4a47e2

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 26 Nov 2018 19:48:17 +0100
parent 9545:9dc7280dd8dc
child 9709:f31ed70c993a
line wrap: on
line diff