aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-05 12:29:21 +0100
committerKim Alvefur <zash@zash.se>2016-12-05 12:29:21 +0100
commit08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb (patch)
treed8491d1afbee7ca428e0a6129a47dcdd9661dca7 /doc
parent2a9484a488a5878e27b5d749b5bbb0d54f497e86 (diff)
parentb151bd4d64f0e25c7c73acca597eadcbbc1c812e (diff)
downloadprosody-08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb.tar.gz
prosody-08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions