Comparison

prosodyctl @ 7944:36a9a4af1873

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 02 Mar 2017 23:03:02 +0100
parent 7923:81f3068fc30c
child 8015:ecb110f45c92
comparison
equal deleted inserted replaced
7923:81f3068fc30c 7944:36a9a4af1873