aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-04-24 18:06:48 +0200
committerKim Alvefur <zash@zash.se>2019-04-24 18:06:48 +0200
commitaac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03 (patch)
tree6428934ad658fb37297399185cbd51ea8adce98d /prosody
parent196ac28ab5b002063f2b25dc60bd809c707b8ab2 (diff)
parentc42a786ec79fcfe936a3dccde9d0cdf70d6255b0 (diff)
downloadprosody-aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03.tar.gz
prosody-aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions