diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-21 02:40:47 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-21 02:40:47 +0100 |
commit | 5759ed4bd315c197324c65375be019040d273203 (patch) | |
tree | 62ffc114d6f84139c60043dba1936d9606f9b6ba /CHANGES | |
parent | fa06e78161ae895c625f78ed745766d4569d6876 (diff) | |
parent | f36fed39e8110ee3c36e0587811ce3268ae6690e (diff) | |
download | prosody-5759ed4bd315c197324c65375be019040d273203.tar.gz prosody-5759ed4bd315c197324c65375be019040d273203.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions