Comparison

prosodyctl @ 7887:93fd15b5ec1b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 Feb 2017 21:34:16 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7885:236b5a6154b2 7887:93fd15b5ec1b