Diff

prosodyctl @ 9704:89f2ebf0615b

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 15 Dec 2018 11:59:11 +0100
parent 9545:9dc7280dd8dc
child 9709:f31ed70c993a
line wrap: on
line diff