aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 17:44:11 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 17:44:11 +0200
commit1792951a48e90ea7bf76d75690b9c0cc8e272beb (patch)
tree028c7d68e28e807e5b55504faeaa1cf3d6211aaf /CHANGES
parent277ee1b09d77a1e1dde4e6983e36d0c240956528 (diff)
parent7ec3aac1af0d965b32e71d760c02cc6a31a99655 (diff)
downloadprosody-1792951a48e90ea7bf76d75690b9c0cc8e272beb.tar.gz
prosody-1792951a48e90ea7bf76d75690b9c0cc8e272beb.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions