diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-10-31 13:17:02 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-10-31 13:17:02 +0000 |
commit | 9aa6e031d7d17067e34df8a7199f304bff0f4c86 (patch) | |
tree | 36c9480558963b704b270003ebc2f308daa2c0f0 /core | |
parent | d4b9a212559e6299828ff50c39bbe9d66dd804a5 (diff) | |
parent | c19a8ef9ff319d31991e1dd8a23bdd9efb9389bb (diff) | |
download | prosody-9aa6e031d7d17067e34df8a7199f304bff0f4c86.tar.gz prosody-9aa6e031d7d17067e34df8a7199f304bff0f4c86.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions