Diff

util/prosodyctl.lua @ 8103:a0b498ec0b22

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Apr 2017 16:21:13 +0200
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff