Comparison

util/prosodyctl.lua @ 8410:54ff1f91e4db

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 21 Nov 2017 23:16:16 +0100
parent 8123:bd591c5fc1bf
child 8634:f6f62c92b642
comparison
equal deleted inserted replaced
8408:b751bee6a829 8410:54ff1f91e4db