diff options
author | Kim Alvefur <zash@zash.se> | 2019-03-28 17:28:20 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-03-28 17:28:20 +0100 |
commit | e1d1f3d4f718e6f71676112877d7f8fe24aec12d (patch) | |
tree | 4467e4b07b12116a8f03ecc024c9f8a4c53967f4 /prosody | |
parent | 36ad587977a55c0042e6aae283b10acbb50a87df (diff) | |
parent | c422e8f13401e50cb13384227f97df3ad55605fd (diff) | |
download | prosody-e1d1f3d4f718e6f71676112877d7f8fe24aec12d.tar.gz prosody-e1d1f3d4f718e6f71676112877d7f8fe24aec12d.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions