diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-13 22:38:31 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-13 22:38:31 +0200 |
commit | d6af211506ae087d30ee569e97b14ef0ca80fa74 (patch) | |
tree | 706e69e60a8560b8fd6634db84455a21c728c0f9 /CHANGES | |
parent | a4b0c946f61d5639fe652d9ddc13bfd0f63d9a17 (diff) | |
parent | 2f0ac824b2ea1ad51c0edf01aaeb9382084f79de (diff) | |
download | prosody-d6af211506ae087d30ee569e97b14ef0ca80fa74.tar.gz prosody-d6af211506ae087d30ee569e97b14ef0ca80fa74.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions