Comparison

prosodyctl @ 8366:272ff3ab25f3

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 29 Oct 2017 02:05:19 +0200
parent 8285:433b2a41351f
child 8440:4e6710b4f873
comparison
equal deleted inserted replaced
8352:6ff50541d2a6 8366:272ff3ab25f3