Diff

prosodyctl @ 9623:4d758f575591

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