aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-15 15:33:31 +0200
committerKim Alvefur <zash@zash.se>2015-05-15 15:33:31 +0200
commit879862c536a5fba488307eb9e8a2f4f6523dbf09 (patch)
tree89f1f780149b6a8649f10f20e23d88635996fc6c /doc
parent217aae0531fa09e57d3b324816da793a72655047 (diff)
parent2de1fd6037e68bdd0b103284ce7c94a2736d9eaa (diff)
downloadprosody-879862c536a5fba488307eb9e8a2f4f6523dbf09.tar.gz
prosody-879862c536a5fba488307eb9e8a2f4f6523dbf09.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions