aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-01-25 21:26:45 +0100
committerKim Alvefur <zash@zash.se>2021-01-25 21:26:45 +0100
commit334aa4ad5c59e33ee986dd6e8b03561dc7684486 (patch)
treefa6ae2ccf7868248d693da9c11b0ecaf15dc7614 /prosody
parent48bc14c169c1267bbdc18cd66a63b73b1c6efb20 (diff)
parent1f45b635448b2b2bb89591999dbe1764ee06d102 (diff)
downloadprosody-334aa4ad5c59e33ee986dd6e8b03561dc7684486.tar.gz
prosody-334aa4ad5c59e33ee986dd6e8b03561dc7684486.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions