aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-12-19 13:25:59 +0000
committerMatthew Wild <mwild1@gmail.com>2018-12-19 13:25:59 +0000
commitab1ba79466e65013077dd9648a868359cc5b42b8 (patch)
tree4511f91ffa4ee12164d8da8dab99ad0dc4ffa05b /core
parent91e23f83983af91b65287c209caa54f9027a6487 (diff)
parent1b1fa872554ff5ac64f7cb58add17f998568fdcd (diff)
downloadprosody-ab1ba79466e65013077dd9648a868359cc5b42b8.tar.gz
prosody-ab1ba79466e65013077dd9648a868359cc5b42b8.zip
Merge 0.11 -> trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions