diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-27 00:06:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-27 00:06:30 +0100 |
commit | 1533b720a73601205bf6fbd87bd2aa7cf60a5fc4 (patch) | |
tree | f0a00027e5736f520eed9f29085db8e8d38926ae /core | |
parent | 1d210c380d7b383b0751eda28971d81ab8c39531 (diff) | |
parent | 375bc82d743c305d2b714bd96c453826dbce2a9a (diff) | |
download | prosody-1533b720a73601205bf6fbd87bd2aa7cf60a5fc4.tar.gz prosody-1533b720a73601205bf6fbd87bd2aa7cf60a5fc4.zip |
Merge
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions