Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Mon, 13 Apr 2020 16:14:39 +0200
changeset 10726 3ddc7c9f35dc
parent 10723 977c9883f625 (current diff)
parent 10725 3a1b1d3084fb (diff)
child 10727 144a1ee24a4e
Merge 0.11->trunk
core/certmanager.lua
util/prosodyctl.lua