diff options
author | Kim Alvefur <zash@zash.se> | 2018-12-20 14:49:50 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-12-20 14:49:50 +0100 |
commit | 9568a1a941644421edaf8bf57db2d1177853affa (patch) | |
tree | 5585523f0723978b54a09189a45ab054c89625d8 /prosody.cfg.lua.dist | |
parent | 6822f0a4f68136b9e00b88cf51ffb1a641d8b02c (diff) | |
parent | 46e97ef82f870f1f425c80d656f0008448c7b7ff (diff) | |
download | prosody-9568a1a941644421edaf8bf57db2d1177853affa.tar.gz prosody-9568a1a941644421edaf8bf57db2d1177853affa.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions