diff options
author | Kim Alvefur <zash@zash.se> | 2018-11-17 15:48:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-11-17 15:48:32 +0100 |
commit | 84440f2e91632d32c5484165547b4c3495fca2c0 (patch) | |
tree | b7dd1f7b94bc4a621e3f8785701731acdf5aa017 /net | |
parent | 4b9b245dc0ec77a2ee8ca99e5a6ec88e301703a6 (diff) | |
parent | 320392f1d11e27b89f8ce0556812465c1bf1ed40 (diff) | |
download | prosody-84440f2e91632d32c5484165547b4c3495fca2c0.tar.gz prosody-84440f2e91632d32c5484165547b4c3495fca2c0.zip |
Merge 0.11->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions