Diff

man/prosodyctl.markdown @ 7063:bc1b375f379e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Jan 2016 16:21:05 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
line wrap: on
line diff