Comparison

man/prosodyctl.markdown @ 7758:2b305ec8c146

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 02 Dec 2016 11:13:05 +0100
parent 7742:18aad564cbc5
child 8171:746d73347937
comparison
equal deleted inserted replaced
7747:0e442402cebc 7758:2b305ec8c146