aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-07 13:36:58 +0200
committerKim Alvefur <zash@zash.se>2016-04-07 13:36:58 +0200
commitb22eef35d7c97defb727023336fb55a29da0f0e9 (patch)
tree0f39bb10c828be602edc862719b32395eb31a248 /CHANGES
parent26261c7a51d04fa39653c75c84b7e0566299d934 (diff)
parentbb95b569ef884a8d6558271382acadcac2f87c66 (diff)
downloadprosody-b22eef35d7c97defb727023336fb55a29da0f0e9.tar.gz
prosody-b22eef35d7c97defb727023336fb55a29da0f0e9.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions