aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-08-21 00:36:42 +0200
committerKim Alvefur <zash@zash.se>2019-08-21 00:36:42 +0200
commitdf727e79fa3b95a6a2663a0a29a5832693ddc4c6 (patch)
treec547cd9afbdd489239a1fed6bd8e97cb05179fa5 /core
parent9f32d30e97c325810bba0ce17fef4491fac2f365 (diff)
parent8b12f4ace11725bb82cc0977cf01514af382f18d (diff)
downloadprosody-df727e79fa3b95a6a2663a0a29a5832693ddc4c6.tar.gz
prosody-df727e79fa3b95a6a2663a0a29a5832693ddc4c6.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions