aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
committerKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
commita65cd04e353b849f6a3cda6ca746378dd309ee28 (patch)
treed54d6743becde2246fed6859f25ec6ee72e0d080 /prosody
parent87805f6e4ed7b0eef2c92cea969da097a53912fe (diff)
parent39bcea0025949af9de9555dee3c2c3f9a5cb7249 (diff)
downloadprosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.tar.gz
prosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions