diff options
author | Kim Alvefur <zash@zash.se> | 2019-06-20 22:26:46 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-06-20 22:26:46 +0200 |
commit | 37fc8f2a2fdaac95d7aee6e51b88514f3febef31 (patch) | |
tree | d9e3f30dd3137ffe8fc830fb6057a26a4115d673 /core | |
parent | 17df356b09c480ca5b994fb36b8a20c8616333c9 (diff) | |
parent | 2033d552cb3819def72ef2507d3dcb0fabfa343e (diff) | |
download | prosody-37fc8f2a2fdaac95d7aee6e51b88514f3febef31.tar.gz prosody-37fc8f2a2fdaac95d7aee6e51b88514f3febef31.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions