aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-10-08 21:07:12 +0200
committerKim Alvefur <zash@zash.se>2016-10-08 21:07:12 +0200
commit0c1aa9cb856c26477832bfd643b9bbd083e6ab09 (patch)
tree5fe55261102b6924bf57aac6168934e490359956 /doc
parente3232fbc9185dd2ccb0bba74d3f5f1fcbd2013ed (diff)
parent992f00f3781dd4b34aa177376cdd8a459d3020b4 (diff)
downloadprosody-0c1aa9cb856c26477832bfd643b9bbd083e6ab09.tar.gz
prosody-0c1aa9cb856c26477832bfd643b9bbd083e6ab09.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions