aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-09-07 19:33:14 +0100
committerMatthew Wild <mwild1@gmail.com>2016-09-07 19:33:14 +0100
commit9bc81d00a58bae2778f9b60b4ecb6cb484fe68b8 (patch)
tree1857990266cbbb0ea2050db25290aeaee0419b54 /core
parentaaefe2e6ed4c9d2cf217a3b6f627e75be3b3f446 (diff)
parent582a2180f2ebd07d084d85ffd3e7641565be6d2f (diff)
downloadprosody-9bc81d00a58bae2778f9b60b4ecb6cb484fe68b8.tar.gz
prosody-9bc81d00a58bae2778f9b60b4ecb6cb484fe68b8.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions