aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-30 13:17:28 +0200
committerKim Alvefur <zash@zash.se>2016-05-30 13:17:28 +0200
commit6dbbb8fe6efc5a482d693860e5b716b3560f3739 (patch)
tree8725903a32a44843a489748ade1914fefe5681fb /CHANGES
parent0963de2358412e9c7591a1aa7f2ba5ac5aa3df76 (diff)
parent45079c02ef1f4edfca446c08a916c61fbf7af9df (diff)
downloadprosody-6dbbb8fe6efc5a482d693860e5b716b3560f3739.tar.gz
prosody-6dbbb8fe6efc5a482d693860e5b716b3560f3739.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions