diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-06 16:05:57 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-06 16:05:57 +0100 |
commit | 12a94eee9180b0aa9d885bfe35b1cab651726511 (patch) | |
tree | 5a6ccfcd8d9fb6e2f2d1d35910732fba43e61132 /CHANGES | |
parent | fbb5d2716262098026125ab7ae1e2ca8b9bc147f (diff) | |
parent | 69990587c92aacfad843fa8f72d49af5870086f5 (diff) | |
download | prosody-12a94eee9180b0aa9d885bfe35b1cab651726511.tar.gz prosody-12a94eee9180b0aa9d885bfe35b1cab651726511.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions