diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-15 02:15:15 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-15 02:15:15 +0200 |
commit | d64532bd722c65d12ba3f1e76c266fdbe921fe8a (patch) | |
tree | e6dd7deeca0d05f62cfa05c92fcd95af2bb83701 /CHANGES | |
parent | 5605d1094b7bf2784f7b7f4c917d91aacf08139a (diff) | |
parent | 098b1c96632a75d3c718a03132341a28db18d14a (diff) | |
download | prosody-d64532bd722c65d12ba3f1e76c266fdbe921fe8a.tar.gz prosody-d64532bd722c65d12ba3f1e76c266fdbe921fe8a.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions