aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-05 20:54:43 +0200
committerKim Alvefur <zash@zash.se>2016-04-05 20:54:43 +0200
commit888df39003d093377dac8e3a0cba7670d996bc07 (patch)
tree7760f4f8fcb6ea74fffad05e021256ddade0bc0f /CHANGES
parent69f2c9017677ef6a1bbec03793ee219d16d09f81 (diff)
parent5c224f9d182a770df51727fbad0798c8e9fe9b31 (diff)
downloadprosody-888df39003d093377dac8e3a0cba7670d996bc07.tar.gz
prosody-888df39003d093377dac8e3a0cba7670d996bc07.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions