diff options
author | Kim Alvefur <zash@zash.se> | 2017-02-15 23:05:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-02-15 23:05:03 +0100 |
commit | f21bbbab6037681ce1496c47213661ad6465a775 (patch) | |
tree | 67fd147c7eafbef789d8a5f9ab9d1fb0dd81bee6 /CHANGES | |
parent | bd92525bf197b524edd4716f5c0a2773d54c5aa7 (diff) | |
parent | 7a2ed1a9edb96cc8c53cbc1428968b70cfe64f2c (diff) | |
download | prosody-f21bbbab6037681ce1496c47213661ad6465a775.tar.gz prosody-f21bbbab6037681ce1496c47213661ad6465a775.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions