Comparison

man/prosodyctl.markdown @ 7878:2fdb7b3648d8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 29 Jan 2017 22:32:03 +0100
parent 7742:18aad564cbc5
child 8171:746d73347937
comparison
equal deleted inserted replaced
7874:de3c6fb74759 7878:2fdb7b3648d8