diff options
author | Kim Alvefur <zash@zash.se> | 2015-12-03 16:46:24 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-12-03 16:46:24 +0100 |
commit | de08c46b98679ccab99e06bb9150a40984f2cf4e (patch) | |
tree | 24b3177a253fc71677e3a963dea3c9eea70c791d /prosody | |
parent | fdab550f02884d68c2de04de4c5b7ed14f19c312 (diff) | |
parent | bb3f6eaf3ac9af77283e79ac3bba96c35221b911 (diff) | |
download | prosody-de08c46b98679ccab99e06bb9150a40984f2cf4e.tar.gz prosody-de08c46b98679ccab99e06bb9150a40984f2cf4e.zip |
Merge...
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions