diff options
author | Kim Alvefur <zash@zash.se> | 2016-10-13 16:31:19 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-10-13 16:31:19 +0200 |
commit | c94b7bbfcffdd04cd2a88af38feb63b1dd99fe8b (patch) | |
tree | 43d1c95604a906942ff994298ae7ddbfeb522ef8 /CHANGES | |
parent | 8b4bf07cf1c68f337a0180f65e25afeca35cb8ab (diff) | |
parent | b25c9172b7ec570a156fe654e6dc0b747c56923a (diff) | |
download | prosody-c94b7bbfcffdd04cd2a88af38feb63b1dd99fe8b.tar.gz prosody-c94b7bbfcffdd04cd2a88af38feb63b1dd99fe8b.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions