Diff

util/prosodyctl.lua @ 7788:cf1d7e35a160

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 15 Dec 2016 13:24:53 +0100
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff