diff options
author | Kim Alvefur <zash@zash.se> | 2018-11-07 21:53:40 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-11-07 21:53:40 +0100 |
commit | ac7682bc92fdd4b7f6ff3a323659dabb649c1afd (patch) | |
tree | 4a6af8ab32ff0fabb03a861461739530aec03738 /core | |
parent | 2a701f2d8b5b024bccbe10ebfcb0e4f1f3ffddf2 (diff) | |
parent | f014ba0feb218c5131e68cd14cafb1feb3e8d7ad (diff) | |
download | prosody-ac7682bc92fdd4b7f6ff3a323659dabb649c1afd.tar.gz prosody-ac7682bc92fdd4b7f6ff3a323659dabb649c1afd.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions