aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-28 18:47:32 +0100
committerKim Alvefur <zash@zash.se>2016-02-28 18:47:32 +0100
commit9c95a61161f878e4a6487c13ea33854a58bad4a0 (patch)
tree45b3d17492ea86ca80f2643bc2d7ac275451deb8 /doc
parentf91689b1464dd53569c64a4cd1215807aa624c87 (diff)
parentb4134596f5f6572604aeef890229acab458f693c (diff)
downloadprosody-9c95a61161f878e4a6487c13ea33854a58bad4a0.tar.gz
prosody-9c95a61161f878e4a6487c13ea33854a58bad4a0.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions