diff options
author | Kim Alvefur <zash@zash.se> | 2018-12-02 02:38:36 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-12-02 02:38:36 +0100 |
commit | c9f3911bd2825c3048c2e04bb328f6dbaab5db14 (patch) | |
tree | 7819234af6cb36c65bec2a37c8f141fd486ebb01 /CHANGES | |
parent | 38b328ad1be357a028a818eaad7c6c3541ac6759 (diff) | |
parent | 010770585cd6899a66fd5373192a94d479e74c86 (diff) | |
download | prosody-c9f3911bd2825c3048c2e04bb328f6dbaab5db14.tar.gz prosody-c9f3911bd2825c3048c2e04bb328f6dbaab5db14.zip |
Merge 0.11->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions