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
commitfc3e9ae033556f915d6ac565545f8ee11f884151 (patch)
tree1e2edc7a500070ec6e76db88cc09af280d3e0588 /core
parent38742f7b507df3687d7d068ff620611a84d874ca (diff)
parent710339a8384dac99e332d05fcadbd87a4f2197b8 (diff)
downloadprosody-fc3e9ae033556f915d6ac565545f8ee11f884151.tar.gz
prosody-fc3e9ae033556f915d6ac565545f8ee11f884151.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions