diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-05-30 22:43:45 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-05-30 22:43:45 +0100 |
commit | 55969635f133580d9d47ef35b0c1de7ae10d48da (patch) | |
tree | add4eed8fa9089dd21a4452a6a097fbd86b55ab1 /net | |
parent | 5e4a7b6ffc7fadd01fd77233a9a4c32d2b373995 (diff) | |
parent | b294f1695c9f638bfb17a97cf6fdae06bd5aed4b (diff) | |
download | prosody-55969635f133580d9d47ef35b0c1de7ae10d48da.tar.gz prosody-55969635f133580d9d47ef35b0c1de7ae10d48da.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions