Diff

util/prosodyctl.lua @ 7723:488fddf88ffd

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