diff options
author | Kim Alvefur <zash@zash.se> | 2022-05-26 17:48:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2022-05-26 17:48:59 +0200 |
commit | 226d9f5ac5a04fcb7391a9cac49962b0171835af (patch) | |
tree | b5e12c8b12127f3a2359f032a4f768f9522c3e3d /core | |
parent | b0e3ea775a9e45d98fe2fa991ccad54a9ca87990 (diff) | |
parent | 8027b67f19bd54eb0d7847a77bf8d642f1d95f16 (diff) | |
download | prosody-226d9f5ac5a04fcb7391a9cac49962b0171835af.tar.gz prosody-226d9f5ac5a04fcb7391a9cac49962b0171835af.zip |
Merge 0.12->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions