Comparison

prosodyctl @ 8349:2342eccf4a88

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 25 Oct 2017 01:32:30 +0200
parent 8285:433b2a41351f
child 8440:4e6710b4f873
comparison
equal deleted inserted replaced
8346:a567a646cf21 8349:2342eccf4a88