Diff

man/prosodyctl.markdown @ 7857:db48b1697234

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