diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-17 23:14:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-17 23:14:03 +0100 |
commit | 29b64a45009858091f41e6443561299cac3416b8 (patch) | |
tree | 5b8b1f9e85e04567be99d8697a881b2aa1179bb0 /CHANGES | |
parent | 3f6b2ced44f52b65d774e5f1486c87e71f5ece36 (diff) | |
parent | 0f64dd00ff74eadf0abe04bc48f15203e5c7a0da (diff) | |
download | prosody-29b64a45009858091f41e6443561299cac3416b8.tar.gz prosody-29b64a45009858091f41e6443561299cac3416b8.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions