aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-24 21:24:03 +0100
committerKim Alvefur <zash@zash.se>2017-01-24 21:24:03 +0100
commita845ca47015583bf7b41f20362fd210c037639f3 (patch)
treecf044930d3acbcf06fd592cc90f3b19d609f9f22 /core
parent45334397e8ae6def260f86a681a509275c67c395 (diff)
parentb70b967a61926bccde4c55bf1e05045025bf44b7 (diff)
downloadprosody-a845ca47015583bf7b41f20362fd210c037639f3.tar.gz
prosody-a845ca47015583bf7b41f20362fd210c037639f3.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions