aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-09 23:15:37 +0100
committerKim Alvefur <zash@zash.se>2018-11-09 23:15:37 +0100
commita9c5f66e07ad7a880262140bd3dc5d3966455a26 (patch)
treedd5729ed6e497941df021ad7d9f2f66af1e80ea8 /core
parentac7682bc92fdd4b7f6ff3a323659dabb649c1afd (diff)
parent60aa42033a2f87013638a7318fb1ea8997e074a2 (diff)
downloadprosody-a9c5f66e07ad7a880262140bd3dc5d3966455a26.tar.gz
prosody-a9c5f66e07ad7a880262140bd3dc5d3966455a26.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions