Diff

man/prosodyctl.markdown @ 7318:1fa6052f3a07

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 26 Mar 2016 14:54:39 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
line wrap: on
line diff