aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-15 23:05:03 +0100
committerKim Alvefur <zash@zash.se>2017-02-15 23:05:03 +0100
commit20ff11cfc9b824ae15e5315248c6ce368c0d0d3f (patch)
tree67fd147c7eafbef789d8a5f9ab9d1fb0dd81bee6 /doc
parent885e117a1fe2f0a77d330c89ad5e44636f25815e (diff)
parent7d79421b6e703c62382534db614a8da2a3e91ff3 (diff)
downloadprosody-20ff11cfc9b824ae15e5315248c6ce368c0d0d3f.tar.gz
prosody-20ff11cfc9b824ae15e5315248c6ce368c0d0d3f.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions