diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-10 16:59:21 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-10 16:59:21 +0100 |
commit | ef417ab41d5ee0578f1d108c574930bde6bc9262 (patch) | |
tree | af21ea2d626caddb6c0e6f4b50e16a21dfb2b2f8 /COPYING | |
parent | 83dce276409b1cdf2c5475dd06956cf50ee1ce6a (diff) | |
parent | d367c8c3ce3f0c0665a402dc9eadde29aade7b61 (diff) | |
download | prosody-ef417ab41d5ee0578f1d108c574930bde6bc9262.tar.gz prosody-ef417ab41d5ee0578f1d108c574930bde6bc9262.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions