aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-08-31 16:40:39 +0100
committerMatthew Wild <mwild1@gmail.com>2016-08-31 16:40:39 +0100
commit0bad074e8621bf2537f597c0ea45718dbddd8f12 (patch)
tree1f8626c471d0a192eaa46cc4ea40325a43a5469f /doc
parent37913e5ce81c5e0b404aa2389102e0a30b00c111 (diff)
parentce1271df1d153a41fb7a063e983dd51ab9226ebb (diff)
downloadprosody-0bad074e8621bf2537f597c0ea45718dbddd8f12.tar.gz
prosody-0bad074e8621bf2537f597c0ea45718dbddd8f12.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions