Diff

prosodyctl @ 9586:44dbee2f173f

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Oct 2018 17:17:07 +0100
parent 9545:9dc7280dd8dc
child 9709:f31ed70c993a
line wrap: on
line diff