diff options
author | Kim Alvefur <zash@zash.se> | 2017-07-06 11:24:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-07-06 11:24:36 +0200 |
commit | a65cd04e353b849f6a3cda6ca746378dd309ee28 (patch) | |
tree | d54d6743becde2246fed6859f25ec6ee72e0d080 /prosody.cfg.lua.dist | |
parent | 87805f6e4ed7b0eef2c92cea969da097a53912fe (diff) | |
parent | 39bcea0025949af9de9555dee3c2c3f9a5cb7249 (diff) | |
download | prosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.tar.gz prosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions