Comparison

man/prosodyctl.markdown @ 7214:a927edfb54ab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Feb 2016 18:47:32 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7211:117f4a627813 7214:a927edfb54ab