Diff

util/prosodyctl.lua @ 7857:db48b1697234

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 23 Jan 2017 19:34:14 +0100
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff