Diff

man/prosodyctl.markdown @ 7110:a2d096203b7f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 28 Jan 2016 15:11:33 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
line wrap: on
line diff