Comparison

util/prosodyctl.lua @ 7986:522099269b49

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 17 Mar 2017 23:14:03 +0100
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
comparison
equal deleted inserted replaced
7984:ae3c5abb3336 7986:522099269b49