aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-09-05 19:08:42 +0100
committerMatthew Wild <mwild1@gmail.com>2014-09-05 19:08:42 +0100
commitc36bca4b4867166fdcc13b771eeab88aa467247f (patch)
tree70ced06db43d2b3ad16862e016d96b42dd1362a0 /core
parent25bb15fc749f2faed1e59ab55a2577729264c641 (diff)
parent716ad8b24a7dc699c39b8b30c484405035a078e8 (diff)
downloadprosody-c36bca4b4867166fdcc13b771eeab88aa467247f.tar.gz
prosody-c36bca4b4867166fdcc13b771eeab88aa467247f.zip
Merge with Florob
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions