diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-24 00:32:09 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-24 00:32:09 +0100 |
| commit | 6b9f928da5595d57d194318e433fa600ad337264 (patch) | |
| tree | 74698345ef518ef640b15ba5c705a0cb0302d66f /CHANGES | |
| parent | 22eb66788580935169b77da1e63e92a599c1e110 (diff) | |
| parent | e6142a0d4b1e5b72236e357287a8e74f57695ef0 (diff) | |
| download | prosody-6b9f928da5595d57d194318e433fa600ad337264.tar.gz prosody-6b9f928da5595d57d194318e433fa600ad337264.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions