Diff

util/prosodyctl.lua @ 7944:36a9a4af1873

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 02 Mar 2017 23:03:02 +0100
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff