diff options
author | Kim Alvefur <zash@zash.se> | 2019-01-10 13:32:57 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-01-10 13:32:57 +0100 |
commit | 8c87ed548da06d0d668034ec04e3527ba3b54716 (patch) | |
tree | eca18db5a8517d12f44d7b07b1453ce03594a879 /prosodyctl | |
parent | f78babf39d9258e217da6d1e6d4e5ee629446271 (diff) | |
parent | 5cd064035a3ea63781edff625c4f402ca7cb3670 (diff) | |
download | prosody-8c87ed548da06d0d668034ec04e3527ba3b54716.tar.gz prosody-8c87ed548da06d0d668034ec04e3527ba3b54716.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions