Diff

util/prosodyctl.lua @ 7957:083c062c2fb7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 15:31:21 +0100 (2017-03-06)
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff