diff options
author | Kim Alvefur <zash@zash.se> | 2017-10-04 12:10:55 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-10-04 12:10:55 +0200 |
commit | 2b7c24b6417aa509fb4f8360d503a24ad6cf5b46 (patch) | |
tree | 31071c1b069ed0de0094100b6522683ff05d0e54 /net | |
parent | ca622317f100d67023e2088179011eb61a243a2d (diff) | |
parent | 14d77f86bb64c5d535e5ac92f3b237eefcbd7a98 (diff) | |
download | prosody-2b7c24b6417aa509fb4f8360d503a24ad6cf5b46.tar.gz prosody-2b7c24b6417aa509fb4f8360d503a24ad6cf5b46.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions