Diff

prosodyctl @ 9675:7d8e08f80dbd

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 02 Dec 2018 02:38:36 +0100
parent 9545:9dc7280dd8dc
child 9709:f31ed70c993a
line wrap: on
line diff