diff options
author | Kim Alvefur <zash@zash.se> | 2018-04-06 01:43:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-04-06 01:43:44 +0200 |
commit | d01d132996c0d275ba20b6f660e9c1ccb55102fd (patch) | |
tree | 7def21644498abe0408ff7db24bb78f2fa0e478c /COPYING | |
parent | 66db222b38dc2795feaaf0ad3452b3534dcfe443 (diff) | |
parent | 399f42a0034f61063330f05e486049e18efdc122 (diff) | |
download | prosody-d01d132996c0d275ba20b6f660e9c1ccb55102fd.tar.gz prosody-d01d132996c0d275ba20b6f660e9c1ccb55102fd.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions