diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-08 15:12:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-08 15:12:44 +0200 |
commit | 01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b (patch) | |
tree | 6af93350c7e5736376dcee4101e54b940539a50e /CHANGES | |
parent | c6a71be31ade7f4d5e23e7ca4189bb4d78cbbe83 (diff) | |
parent | a18479bd7009a6b522ee8227d56dbb10165986dc (diff) | |
download | prosody-01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b.tar.gz prosody-01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions