Comparison

man/prosodyctl.markdown @ 7456:76a8456cf1e2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 12 Jun 2016 20:06:30 +0200
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7452:d916703d5e18 7456:76a8456cf1e2