aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-12-03 16:46:24 +0100
committerKim Alvefur <zash@zash.se>2015-12-03 16:46:24 +0100
commitde08c46b98679ccab99e06bb9150a40984f2cf4e (patch)
tree24b3177a253fc71677e3a963dea3c9eea70c791d /prosody
parentfdab550f02884d68c2de04de4c5b7ed14f19c312 (diff)
parentbb3f6eaf3ac9af77283e79ac3bba96c35221b911 (diff)
downloadprosody-de08c46b98679ccab99e06bb9150a40984f2cf4e.tar.gz
prosody-de08c46b98679ccab99e06bb9150a40984f2cf4e.zip
Merge...
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions