diff options
author | Kim Alvefur <zash@zash.se> | 2018-07-08 19:12:17 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-07-08 19:12:17 +0200 |
commit | a4d7a083175658591a6a61a9716da3693ee7bbc1 (patch) | |
tree | 8149a83b8082869e08583bd1e4f20256c8e3f3ca /prosody.cfg.lua.dist | |
parent | d3db6ff3baeb1e8b4e8ff442b000c594d22b2645 (diff) | |
parent | 759fe72f49e08114f36d880e60e64e77781e4c59 (diff) | |
download | prosody-a4d7a083175658591a6a61a9716da3693ee7bbc1.tar.gz prosody-a4d7a083175658591a6a61a9716da3693ee7bbc1.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions