Comparison

man/prosodyctl.markdown @ 7286:30b9433a9f3e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 17 Mar 2016 18:04:43 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7282:29eedc776bbd 7286:30b9433a9f3e