aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-04-24 22:59:41 +0100
committerMatthew Wild <mwild1@gmail.com>2018-04-24 22:59:41 +0100
commit280eda897986aea9e7fe0fa4fb53f9130681b58b (patch)
tree32738193f40c5114889c72612fe0dfbffa325d38 /core
parentaebd5479d216cf4e122911fc7b10d2f4b88cc533 (diff)
parent9a76ea7e31d5034607932ac304d89c40bf9c59bf (diff)
downloadprosody-280eda897986aea9e7fe0fa4fb53f9130681b58b.tar.gz
prosody-280eda897986aea9e7fe0fa4fb53f9130681b58b.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions