Comparison

prosodyctl @ 8406:e39edc6d1523

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 20 Nov 2017 02:22:09 +0100
parent 8285:433b2a41351f
child 8440:4e6710b4f873
comparison
equal deleted inserted replaced
8402:469afa02947b 8406:e39edc6d1523