Diff

man/prosodyctl.markdown @ 7822:4caaa0c185f1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 13 Jan 2017 18:30:18 +0100
parent 7742:18aad564cbc5
child 8171:746d73347937
line wrap: on
line diff