aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-16 23:49:27 +0100
committerKim Alvefur <zash@zash.se>2017-03-16 23:49:27 +0100
commit3601968ff85a10f18f1dba92360aac7efabe09ad (patch)
tree5d9e9dfec7020f862dc40a4b872556e3661b5327 /doc
parent33f73b5b885da18cef1b983cd1a1fe6d287e0391 (diff)
parent4ce8edd6eb83eff68970077e9c3c99df19f5a955 (diff)
downloadprosody-3601968ff85a10f18f1dba92360aac7efabe09ad.tar.gz
prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions