diff options
author | Kim Alvefur <zash@zash.se> | 2021-07-03 17:28:07 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2021-07-03 17:28:07 +0200 |
commit | 87167772cab6be6f0e74075d8212347f5e2cc698 (patch) | |
tree | b53e8e8bb65b5551ed752f5a4a0b4c100bd445c9 /prosody | |
parent | 130f74381c9b07ae51dc8e0657909b11fadf6ec0 (diff) | |
parent | 59d820880f0421041b72b73d1fe52aa64adce43d (diff) | |
download | prosody-87167772cab6be6f0e74075d8212347f5e2cc698.tar.gz prosody-87167772cab6be6f0e74075d8212347f5e2cc698.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions