aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-08 22:01:10 +0200
committerKim Alvefur <zash@zash.se>2016-07-08 22:01:10 +0200
commitc14840340a365a79517ff455b3e84d25ef62c159 (patch)
treee5339d0c057334591e52af0777588890d51081a5 /CHANGES
parent01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b (diff)
parentc53e625e427b1197b45ac9bbdf192cb07c6f2285 (diff)
downloadprosody-c14840340a365a79517ff455b3e84d25ef62c159.tar.gz
prosody-c14840340a365a79517ff455b3e84d25ef62c159.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions