diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-08 16:41:09 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-08 16:41:09 +0200 |
commit | 68f3c9dede8ad33e50057c2566964285e18874bc (patch) | |
tree | 28ff249f142d219a8fe1f7ede89996f393084875 /CHANGES | |
parent | 0b44bf4b7fbbc088ab2a1d90f7e19c68a46601ea (diff) | |
parent | 3506b088471128c7579c11782dff473223f49579 (diff) | |
download | prosody-68f3c9dede8ad33e50057c2566964285e18874bc.tar.gz prosody-68f3c9dede8ad33e50057c2566964285e18874bc.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions