aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-06-23 15:17:35 +0200
committerKim Alvefur <zash@zash.se>2020-06-23 15:17:35 +0200
commit49663eba20340f7564012ebaa52a75e9a3057c10 (patch)
treef9636ba7b7fa26be67211e5ac36db42331b9324d /core
parent073a654eff55f79b67bd424529734538a1d7009e (diff)
parentbd36651336dcfd19229d8ce9ec96c0b000608803 (diff)
downloadprosody-49663eba20340f7564012ebaa52a75e9a3057c10.tar.gz
prosody-49663eba20340f7564012ebaa52a75e9a3057c10.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions