Comparison

man/prosodyctl.man @ 6775:22c8deb43daf

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 11 Aug 2015 10:29:25 +0200 (2015-08-11)
parent 2699:1ae8a1ac93bd
child 7032:817c7b197ac7
comparison
equal deleted inserted replaced
6770:cb84731b2dfd 6775:22c8deb43daf