aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-11 20:03:00 +0200
committerKim Alvefur <zash@zash.se>2015-10-11 20:03:00 +0200
commitec268ace11395bb845a401852b9f49918947ae52 (patch)
tree38ce0d5d3bebeb2cc1e63965c9492ee0a8526dc9 /doc
parent6c79c243796faaa674eb591a15257a965b9f30ae (diff)
parent7835e7573e12cc36b70110705dd7b5571d26fbb9 (diff)
downloadprosody-ec268ace11395bb845a401852b9f49918947ae52.tar.gz
prosody-ec268ace11395bb845a401852b9f49918947ae52.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions