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 | ae48864f9d7368bf2030d391d68d6363278202ea (patch) | |
tree | d9e3f30dd3137ffe8fc830fb6057a26a4115d673 /prosody.cfg.lua.dist | |
parent | 48501136ee6a496f3e495f60a08a1c3907d32039 (diff) | |
parent | 0b32ffe8599ff5908cf55ac956202b21d64a0391 (diff) | |
download | prosody-ae48864f9d7368bf2030d391d68d6363278202ea.tar.gz prosody-ae48864f9d7368bf2030d391d68d6363278202ea.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions