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 | ef25fe98b2c605335e9f31e363eb49a832ca9f48 (patch) | |
tree | 4a6af8ab32ff0fabb03a861461739530aec03738 /net | |
parent | 48162c5fca869aa8adefc5dc7e8a58bf1ce40c20 (diff) | |
parent | 88b509b8350eb652110fe5ebc1f2ff55c3f567a4 (diff) | |
download | prosody-ef25fe98b2c605335e9f31e363eb49a832ca9f48.tar.gz prosody-ef25fe98b2c605335e9f31e363eb49a832ca9f48.zip |
Merge 0.11->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions