aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-03-29 22:12:42 +0200
committerKim Alvefur <zash@zash.se>2020-03-29 22:12:42 +0200
commitd7f8fa848d1c2391a35ed8ebc41a9cb228466fa4 (patch)
tree48d64237beace3f2a11ba34c5a02db82ac449155 /prosody
parentf1d66f402e2f4547aec796764fc926023f5b143e (diff)
parent7484fb15cba4cacd0125a63d78dcb781ba7a1d4f (diff)
downloadprosody-d7f8fa848d1c2391a35ed8ebc41a9cb228466fa4.tar.gz
prosody-d7f8fa848d1c2391a35ed8ebc41a9cb228466fa4.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions