aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-30 19:43:12 +0100
committerKim Alvefur <zash@zash.se>2018-11-30 19:43:12 +0100
commitb9beadc7c8d795c629cbf2239f50be7dfc165a4c (patch)
tree2fe858f552ac60040e600c4dd99d8ca7b3c0bdb0 /core
parentc69c7e8d8eb8cc9cb383ec7fa098369ab657b8a2 (diff)
parent6176e9ff1b48d42310eed5730aa82d8bc3968d22 (diff)
downloadprosody-b9beadc7c8d795c629cbf2239f50be7dfc165a4c.tar.gz
prosody-b9beadc7c8d795c629cbf2239f50be7dfc165a4c.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions