Comparison

prosodyctl @ 8999:a2a4c225a3f8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 08 Jul 2018 19:12:17 +0200
parent 8948:3be8799263f3
child 9231:3d12b4f41b23
comparison
equal deleted inserted replaced
8997:8c4dd4375823 8999:a2a4c225a3f8