aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-03 16:06:16 +0100
committerKim Alvefur <zash@zash.se>2016-03-03 16:06:16 +0100
commitae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4 (patch)
tree6ff9f371d84546013bcbbb7ad355b0230c37b46b /doc
parent0b702d28acf78831d94c75d4c239650ee1fe2c53 (diff)
parent3140ed3d626e976639ef5f38efb9790008834d9c (diff)
downloadprosody-ae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4.tar.gz
prosody-ae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions