diff options
author | Kim Alvefur <zash@zash.se> | 2012-10-24 19:56:22 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-10-24 19:56:22 +0200 |
commit | 326bb884c8bce004961b32f00485f52c216bf5d4 (patch) | |
tree | 2d93f16e8d107baedd6226f11434a1ecc852b9c7 /prosody.cfg.lua.dist | |
parent | 07d035d93ce4bb8f9fa19840653654688e3eec8f (diff) | |
parent | b7219c57f4264a8d5655404a3c840f3113096dc8 (diff) | |
download | prosody-326bb884c8bce004961b32f00485f52c216bf5d4.tar.gz prosody-326bb884c8bce004961b32f00485f52c216bf5d4.zip |
Merge 0.9 -> trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions