Diff

util/prosodyctl.lua @ 7791:8efd51667622

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 19 Dec 2016 09:34:40 +0100 (2016-12-19)
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff