aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-02-21 23:01:43 +0100
committerKim Alvefur <zash@zash.se>2020-02-21 23:01:43 +0100
commitaa6a550cebc5bc0e8d1c0e5a5174f600d37a4e3f (patch)
treea226e5f3313ea02ce1781f4ad2ed55d4d186e9d9 /prosody
parente19909198725b6c338dcb2d6714849505faafefc (diff)
parent84e0c87b7e165f58f8061ad92c73dddc100cee23 (diff)
downloadprosody-aa6a550cebc5bc0e8d1c0e5a5174f600d37a4e3f.tar.gz
prosody-aa6a550cebc5bc0e8d1c0e5a5174f600d37a4e3f.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions