Diff

util/prosodyctl.lua @ 7717:9c8eb0239eef

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 05 Nov 2016 00:28:30 +0100
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff