aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-07 16:48:28 +0100
committerKim Alvefur <zash@zash.se>2016-03-07 16:48:28 +0100
commit51aba8fe68050cfcfad2862aa9fb394f3f44002c (patch)
treecf6e79601724c932aa530ca0699725d93f47ab32 /doc
parent7fc54d8b6628899909ae4c0c50030490caab5abe (diff)
parentdea5da6574310f837ecdb68767c2806c0d983ed2 (diff)
downloadprosody-51aba8fe68050cfcfad2862aa9fb394f3f44002c.tar.gz
prosody-51aba8fe68050cfcfad2862aa9fb394f3f44002c.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions