diff options
author | Kim Alvefur <zash@zash.se> | 2016-10-08 21:07:12 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-10-08 21:07:12 +0200 |
commit | 0c1aa9cb856c26477832bfd643b9bbd083e6ab09 (patch) | |
tree | 5fe55261102b6924bf57aac6168934e490359956 /doc | |
parent | e3232fbc9185dd2ccb0bba74d3f5f1fcbd2013ed (diff) | |
parent | 992f00f3781dd4b34aa177376cdd8a459d3020b4 (diff) | |
download | prosody-0c1aa9cb856c26477832bfd643b9bbd083e6ab09.tar.gz prosody-0c1aa9cb856c26477832bfd643b9bbd083e6ab09.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions