aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-24 14:19:49 +0200
committerKim Alvefur <zash@zash.se>2017-04-24 14:19:49 +0200
commit706849aa1ef9f5f2f6494d14d7de0ac9e1647190 (patch)
tree13ca49cac213b410c52092725470206f070d7450 /doc
parent708f82e198006129be93ea2d60504c30d200ee06 (diff)
parent04abad10a7f83c64a2bafdcb2888e9cad815f47d (diff)
downloadprosody-706849aa1ef9f5f2f6494d14d7de0ac9e1647190.tar.gz
prosody-706849aa1ef9f5f2f6494d14d7de0ac9e1647190.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions