diff options
author | Kim Alvefur <zash@zash.se> | 2018-11-12 22:51:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-11-12 22:51:30 +0100 |
commit | a4056f992c75e45b39769fdbeb201461e62a0359 (patch) | |
tree | c6f5451fac4f2403e1c185bbff2eb25f107395e0 /net | |
parent | 2048b8d48204bb1e8c85ccc33916d98337a28fc0 (diff) | |
parent | 4c07742fbbbcd6aabb38c7779c5ec76a52182012 (diff) | |
download | prosody-a4056f992c75e45b39769fdbeb201461e62a0359.tar.gz prosody-a4056f992c75e45b39769fdbeb201461e62a0359.zip |
Merge 0.11->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions