aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-10-08 21:07:12 +0200
committerKim Alvefur <zash@zash.se>2016-10-08 21:07:12 +0200
commitde36c063b3efe67350888cd8334c7c17a1acd439 (patch)
tree5fe55261102b6924bf57aac6168934e490359956 /CHANGES
parent15c519eb2fa4ab7a704f2f3817c41233e78c7624 (diff)
parent3dd1ce8680d7831d2934013850067c5141069adb (diff)
downloadprosody-de36c063b3efe67350888cd8334c7c17a1acd439.tar.gz
prosody-de36c063b3efe67350888cd8334c7c17a1acd439.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions