Comparison

man/prosodyctl.markdown @ 7232:db0dc08929e7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 03 Mar 2016 16:06:16 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7225:a74f0b7be6bf 7232:db0dc08929e7