diff options
author | Kim Alvefur <zash@zash.se> | 2017-11-03 01:17:53 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-11-03 01:17:53 +0100 |
commit | 772fed8862a33dc06b00550f380fae852f20ff79 (patch) | |
tree | 1b26745b4408f42a4919b6f5161132763178f52c /CHANGES | |
parent | db152d626b282e87090cc6c1c5bf61b13a691b47 (diff) | |
parent | 7cd68eaac1feb8b9d06d872c76bc781da1e3e400 (diff) | |
download | prosody-772fed8862a33dc06b00550f380fae852f20ff79.tar.gz prosody-772fed8862a33dc06b00550f380fae852f20ff79.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions