diff options
author | Kim Alvefur <zash@zash.se> | 2020-06-23 15:17:35 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2020-06-23 15:17:35 +0200 |
commit | 49663eba20340f7564012ebaa52a75e9a3057c10 (patch) | |
tree | f9636ba7b7fa26be67211e5ac36db42331b9324d /core | |
parent | 073a654eff55f79b67bd424529734538a1d7009e (diff) | |
parent | bd36651336dcfd19229d8ce9ec96c0b000608803 (diff) | |
download | prosody-49663eba20340f7564012ebaa52a75e9a3057c10.tar.gz prosody-49663eba20340f7564012ebaa52a75e9a3057c10.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions