aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-28 20:05:56 +0100
committerKim Alvefur <zash@zash.se>2016-02-28 20:05:56 +0100
commit8e521f441ea38df4156e4945c564c11fefbffd17 (patch)
tree8212a106f78e4d988ee48d938496162cf17d890a /doc
parentffc455a307546e590923e3df6848bec2bc8fce17 (diff)
parent47450a0eff25547333f561ff2903f92d081c9bdf (diff)
downloadprosody-8e521f441ea38df4156e4945c564c11fefbffd17.tar.gz
prosody-8e521f441ea38df4156e4945c564c11fefbffd17.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions