diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-09 10:17:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-09 10:17:39 +0100 |
| commit | fde889b4ececec3509342955533058672df4a2c3 (patch) | |
| tree | f74647d6ef7f599b9f5283ae25b85c10ac124a2e /CHANGES | |
| parent | 3c6c798435a4197ea3d07db09ee5df58a1216b26 (diff) | |
| parent | d3f66c0848559e7f019aa50617052a0030f2df65 (diff) | |
| download | prosody-fde889b4ececec3509342955533058672df4a2c3.tar.gz prosody-fde889b4ececec3509342955533058672df4a2c3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions