diff options
author | Kim Alvefur <zash@zash.se> | 2018-04-10 20:23:54 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-04-10 20:23:54 +0200 |
commit | 5d2a541a3ddabdc146615ffd1c1de8475e64fca7 (patch) | |
tree | 56ce87b57c881f7a5096b5f8c24b3cc4cc34fcdc /CHANGES | |
parent | 693a06e2f3094f51f11fd0fe1ee50d230be1cba6 (diff) | |
parent | b9a0fc550ea5ae7434098fdbba7d4f141b83cd71 (diff) | |
download | prosody-5d2a541a3ddabdc146615ffd1c1de8475e64fca7.tar.gz prosody-5d2a541a3ddabdc146615ffd1c1de8475e64fca7.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions