Comparison

man/prosodyctl.markdown @ 7447:843fe134453e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 30 May 2016 13:17:28 +0200
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7444:45d28235ebe0 7447:843fe134453e