diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-08 22:01:10 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-08 22:01:10 +0200 |
commit | c14840340a365a79517ff455b3e84d25ef62c159 (patch) | |
tree | e5339d0c057334591e52af0777588890d51081a5 /CHANGES | |
parent | 01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b (diff) | |
parent | c53e625e427b1197b45ac9bbdf192cb07c6f2285 (diff) | |
download | prosody-c14840340a365a79517ff455b3e84d25ef62c159.tar.gz prosody-c14840340a365a79517ff455b3e84d25ef62c159.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions