aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-30 13:17:28 +0200
committerKim Alvefur <zash@zash.se>2016-05-30 13:17:28 +0200
commitfcca840db8d7c39253869f27fbca736da6c43909 (patch)
tree8725903a32a44843a489748ade1914fefe5681fb /doc
parente8e531fa1d45b4b454abdac3a170cba16da02b86 (diff)
parent6b2c577b2097728507d23a6d2b2fa9207a22df9d (diff)
downloadprosody-fcca840db8d7c39253869f27fbca736da6c43909.tar.gz
prosody-fcca840db8d7c39253869f27fbca736da6c43909.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions