Diff

prosodyctl @ 9654:ede4e15a0fed

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 27 Nov 2018 21:23:31 +0100
parent 9545:9dc7280dd8dc
child 9709:f31ed70c993a
line wrap: on
line diff