diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-04-04 18:42:05 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-04-04 18:42:05 +0100 |
commit | ac665260b87e90bf6c5a0700b22db5a54701f9c6 (patch) | |
tree | 192dddbb9a5b935e8686f7b67a483a028fd67fec /CHANGES | |
parent | 574ae71c70e6d775bd0ef735b2c0f84addc23f95 (diff) | |
parent | 0e4c35dd868723eb1bf99dc72484fd076fffb9f6 (diff) | |
download | prosody-ac665260b87e90bf6c5a0700b22db5a54701f9c6.tar.gz prosody-ac665260b87e90bf6c5a0700b22db5a54701f9c6.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions