aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-04-03 22:39:48 +0200
committerKim Alvefur <zash@zash.se>2020-04-03 22:39:48 +0200
commit7fe0b14aa78dda39d3b47adc40655b6e805b141b (patch)
tree1e2edc7a500070ec6e76db88cc09af280d3e0588 /core
parentd4c500cb06a9f7669cd33f86c8ea1753c74fe514 (diff)
parente692604f31230e991f7ac1194c434ef237aae3f6 (diff)
downloadprosody-7fe0b14aa78dda39d3b47adc40655b6e805b141b.tar.gz
prosody-7fe0b14aa78dda39d3b47adc40655b6e805b141b.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions