diff options
author | Kim Alvefur <zash@zash.se> | 2020-03-29 22:12:42 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2020-03-29 22:12:42 +0200 |
commit | d7f8fa848d1c2391a35ed8ebc41a9cb228466fa4 (patch) | |
tree | 48d64237beace3f2a11ba34c5a02db82ac449155 /core | |
parent | f1d66f402e2f4547aec796764fc926023f5b143e (diff) | |
parent | 7484fb15cba4cacd0125a63d78dcb781ba7a1d4f (diff) | |
download | prosody-d7f8fa848d1c2391a35ed8ebc41a9cb228466fa4.tar.gz prosody-d7f8fa848d1c2391a35ed8ebc41a9cb228466fa4.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions