diff options
| author | Kim Alvefur <zash@zash.se> | 2017-06-13 16:38:53 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-06-13 16:38:53 +0200 |
| commit | c4def1909c1050c1852b92c90910fbe0abadcaba (patch) | |
| tree | 027f373f39d309bbe3d85c2da089f0c59904e131 /CHANGES | |
| parent | 7586690f44817e61f5a0ef8974a7bdba38d86028 (diff) | |
| parent | 9e04351ec4952f458374d6d0de2975baed8ab41c (diff) | |
| download | prosody-c4def1909c1050c1852b92c90910fbe0abadcaba.tar.gz prosody-c4def1909c1050c1852b92c90910fbe0abadcaba.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions