Comparison

man/prosodyctl.markdown @ 7989:5632aa85e0b6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 20 Mar 2017 03:11:27 +0100
parent 7742:18aad564cbc5
child 8171:746d73347937
comparison
equal deleted inserted replaced
7986:522099269b49 7989:5632aa85e0b6