diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-10 23:16:13 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-10 23:16:13 +0200 |
commit | 61c1325aa6509896b202f731c546e980ef97fff4 (patch) | |
tree | e163b8572f88719bc01ba397d169da78c4fc8d48 /prosody.cfg.lua.dist | |
parent | fcca450715b5ccb94002dc9dd2babfe214955f4b (diff) | |
parent | 1796c0795624152f8415ad64f9cdab62a9ad6402 (diff) | |
download | prosody-61c1325aa6509896b202f731c546e980ef97fff4.tar.gz prosody-61c1325aa6509896b202f731c546e980ef97fff4.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions