Comparison

man/prosodyctl.markdown @ 7434:3b16f2802ef0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 22 May 2016 14:39:20 +0200
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7429:713d6f8e84d0 7434:3b16f2802ef0