diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-29 22:32:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-29 22:32:03 +0100 |
commit | c534c1414eec471209c54a917152593da3198c90 (patch) | |
tree | 7057f2f6ba6b58e5e7b483bba598fdc3f76f9a82 /prosody.cfg.lua.dist | |
parent | e75e05ebc9f165cc5b297c9c382fa4419e7f270b (diff) | |
parent | 2f315391e38628eaa0a0baa550091a29cecb6433 (diff) | |
download | prosody-c534c1414eec471209c54a917152593da3198c90.tar.gz prosody-c534c1414eec471209c54a917152593da3198c90.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions