aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-25 15:40:35 +0100
committerKim Alvefur <zash@zash.se>2016-02-25 15:40:35 +0100
commite8ae582f9096da3eb413f4b2dd31ac1a494f361c (patch)
tree510af1472114eea8f6d102eddf1506f3b8b7dcfa /doc
parent9a7bce4946a4a302905bdccd23ce59dc245803e8 (diff)
parent14ddd031ce06a21be7aae239b95cb393b3fb7f10 (diff)
downloadprosody-e8ae582f9096da3eb413f4b2dd31ac1a494f361c.tar.gz
prosody-e8ae582f9096da3eb413f4b2dd31ac1a494f361c.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions