Comparison

prosodyctl @ 8162:a49c8930da3d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 01 Jun 2017 14:05:58 +0200
parent 8153:c22d5680ca68
child 8181:79f73af4c410
comparison
equal deleted inserted replaced
8158:b4cbd65ee4c5 8162:a49c8930da3d