diff options
author | Kim Alvefur <zash@zash.se> | 2013-06-10 14:37:02 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-06-10 14:37:02 +0200 |
commit | 2b974f31e049aad7b8087b133fb65f9718923a61 (patch) | |
tree | f747cec5628a781bedbf4869bfdd57c3f1ec5a81 /prosody.cfg.lua.dist | |
parent | 0086d5819d632016a5795c9718be2f35c22ac8f5 (diff) | |
parent | 36910d3b8861030001ddc2c7fdd8fbe0f34887f9 (diff) | |
download | prosody-2b974f31e049aad7b8087b133fb65f9718923a61.tar.gz prosody-2b974f31e049aad7b8087b133fb65f9718923a61.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions