aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-25 22:37:41 +0100
committerKim Alvefur <zash@zash.se>2016-02-25 22:37:41 +0100
commitd17785e91f5a14942de3257207f3f2d058162467 (patch)
treec296ef2b89bd5fac3f1ee1eae5a627c921b375ce /prosody
parent9eda046093639bd46aa77d554e7e8aa90a5c1d18 (diff)
parentfc2ad03510cab182ac83ac8aaf6d9ce66acdec87 (diff)
downloadprosody-d17785e91f5a14942de3257207f3f2d058162467.tar.gz
prosody-d17785e91f5a14942de3257207f3f2d058162467.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions