diff options
author | Kim Alvefur <zash@zash.se> | 2018-05-22 22:25:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-05-22 22:25:59 +0200 |
commit | c931751893fa558de2150ca1c4b76427cdeddd09 (patch) | |
tree | 54d397a353338cb5ac1a004ec5f86cc834a06248 /prosody.cfg.lua.dist | |
parent | a012355b09e6415a7eb3b80bc5ebe5f0add650d2 (diff) | |
parent | 0f78fff909b3c670fc39ab40a12854d06acd6f98 (diff) | |
download | prosody-c931751893fa558de2150ca1c4b76427cdeddd09.tar.gz prosody-c931751893fa558de2150ca1c4b76427cdeddd09.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions