Diff

man/prosodyctl.markdown @ 7719:17c7e3ac47f7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 17 Nov 2016 23:20:41 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
line wrap: on
line diff