diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-02 00:24:37 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-02 00:24:37 +0200 |
commit | d6f2c308a4151199c34d3baeb910f40c64d55be8 (patch) | |
tree | 5749f7a93bf1a098085221f3bbcde3c238c778d5 /CHANGES | |
parent | 75ed409006e229b29beeaff5807f227ace290eef (diff) | |
parent | 3811ceb6cac48480c300c6ed09dc555e5cec754d (diff) | |
download | prosody-d6f2c308a4151199c34d3baeb910f40c64d55be8.tar.gz prosody-d6f2c308a4151199c34d3baeb910f40c64d55be8.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions