diff options
author | Kim Alvefur <zash@zash.se> | 2018-02-04 01:40:11 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-02-04 01:40:11 +0100 |
commit | 8aa6920ff52a1ab6191514a164deded4956748f6 (patch) | |
tree | 661dfb5bfa698d4ee4646df7df94ac8c78a984a0 /net | |
parent | 76ba5218c221ae8d58edddf8b4097966f2e18180 (diff) | |
parent | cf7486984a083cbe6653063814aa893dcae20054 (diff) | |
download | prosody-8aa6920ff52a1ab6191514a164deded4956748f6.tar.gz prosody-8aa6920ff52a1ab6191514a164deded4956748f6.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions