diff options
| author | Kim Alvefur <zash@zash.se> | 2017-06-01 14:05:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-06-01 14:05:58 +0200 |
| commit | 7586690f44817e61f5a0ef8974a7bdba38d86028 (patch) | |
| tree | 241ce473feccaef38dcf409ebac3d60868fc6a72 /CHANGES | |
| parent | f176688ed175d5e8768b3232a9d934f9a380bd61 (diff) | |
| parent | 3c37921b044842e3c1e73cea3ac9be6bbcf997ed (diff) | |
| download | prosody-7586690f44817e61f5a0ef8974a7bdba38d86028.tar.gz prosody-7586690f44817e61f5a0ef8974a7bdba38d86028.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions