Diff

util/prosodyctl.lua @ 7786:b62353e6a8e5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 14 Dec 2016 01:47:19 +0100
parent 7457:5e18416881bb
child 8123:bd591c5fc1bf
line wrap: on
line diff