aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-22 02:36:10 +0100
committerKim Alvefur <zash@zash.se>2017-11-22 02:36:10 +0100
commit83c3e348f7b8e60d9cba766ea8de2ff482aed71f (patch)
treeb8924d939965bcf3ffbf9477eb4f73d16ca4b471 /prosody
parentcbfe174fa4616d7a70fc1211cfa53c4d65555955 (diff)
parent70fbc5ba5818eeb9c5e1357306eaae31030d99f6 (diff)
downloadprosody-83c3e348f7b8e60d9cba766ea8de2ff482aed71f.tar.gz
prosody-83c3e348f7b8e60d9cba766ea8de2ff482aed71f.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions