aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-12-29 20:50:07 +0100
committerKim Alvefur <zash@zash.se>2017-12-29 20:50:07 +0100
commit7026ec90060954062365b75c9974eb8045d9f548 (patch)
treef99617f5697506024e44291a1efd56e81a69f031 /prosody
parente6ada2cc8cac45d403590bb499c65a8b817f3658 (diff)
parent76d18a84640f7083f658776d66a7833f067e0377 (diff)
downloadprosody-7026ec90060954062365b75c9974eb8045d9f548.tar.gz
prosody-7026ec90060954062365b75c9974eb8045d9f548.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions