aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-05-15 21:26:54 +0200
committerKim Alvefur <zash@zash.se>2020-05-15 21:26:54 +0200
commite32f71d3d4ee4a69f57bf6891f8a255fa884f4ba (patch)
tree9da1364fef20e514e3b3fb2b794abd24fe9919f1 /core
parentd916ce38f6b434552a5ebd2a1751286da9cf2d69 (diff)
parentfaa381e3edc0ff5e44e0ff78b65b683a3ffe1d70 (diff)
downloadprosody-e32f71d3d4ee4a69f57bf6891f8a255fa884f4ba.tar.gz
prosody-e32f71d3d4ee4a69f57bf6891f8a255fa884f4ba.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions