Diff

util/prosodyctl.lua @ 7516:f74ff35a4b03

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Jul 2016 18:58:58 +0200
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff