Comparison

man/prosodyctl.markdown @ 7780:dbd202e7c587

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 10 Dec 2016 02:55:38 +0100
parent 7742:18aad564cbc5
child 8171:746d73347937
comparison
equal deleted inserted replaced
7768:57d0f2d3d5c5 7780:dbd202e7c587