aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-03-17 13:08:31 +0000
committerMatthew Wild <mwild1@gmail.com>2017-03-17 13:08:31 +0000
commit6c23b9334dce0d75e72e5ead56d72b0e6acc9b5a (patch)
treebde2c18dd96f4ad8dbf284a4e6c95d1172975c37 /doc
parent3601968ff85a10f18f1dba92360aac7efabe09ad (diff)
parent649b17b2e49b40796de43692b04bba22f6bf5c9b (diff)
downloadprosody-6c23b9334dce0d75e72e5ead56d72b0e6acc9b5a.tar.gz
prosody-6c23b9334dce0d75e72e5ead56d72b0e6acc9b5a.zip
Merge 0.10 -> trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions