aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-05-25 03:33:13 +0200
committerKim Alvefur <zash@zash.se>2018-05-25 03:33:13 +0200
commit546ba10bfd89912565c29b874323d5d3db0f1717 (patch)
tree9d7db4f22ab5aeb436958158bd5bc14285a7f05a /prosody
parentb531286f23283fb3315aa53778de3b618d33641d (diff)
parent5b0c75379e205e33a24efa674da250d5ac3f7c47 (diff)
downloadprosody-546ba10bfd89912565c29b874323d5d3db0f1717.tar.gz
prosody-546ba10bfd89912565c29b874323d5d3db0f1717.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions