Comparison

man/prosodyctl.markdown @ 7963:4f9535b7fdf7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 16:05:57 +0100
parent 7742:18aad564cbc5
child 8171:746d73347937
comparison
equal deleted inserted replaced
7958:47cb54a08336 7963:4f9535b7fdf7