diff options
author | Kim Alvefur <zash@zash.se> | 2015-12-03 16:17:40 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-12-03 16:17:40 +0100 |
commit | c24e8f3738599d7b954003bcbdb8eee20b108c5d (patch) | |
tree | c03492afc44cd6ca75160619982fc3ecc4defdfd /net | |
parent | b810e6f3e14ac89c4f7d4477196a81740eb9a2a3 (diff) | |
parent | 8b1e8e2e6ba562f0e59d36ea190ed50eef749af8 (diff) | |
download | prosody-c24e8f3738599d7b954003bcbdb8eee20b108c5d.tar.gz prosody-c24e8f3738599d7b954003bcbdb8eee20b108c5d.zip |
Merge
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions