diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-22 18:52:20 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-22 18:52:20 +0100 |
commit | b442c597977063fd641c12aedc21c162685295db (patch) | |
tree | 9869dd79155c8a772cec73c5e2cfe9201da10636 /prosody.cfg.lua.dist | |
parent | 0f2e8a78418d03476741324bfea63be1b7e67712 (diff) | |
parent | 0035673eee9bac398e503bdcf410f482c140098f (diff) | |
download | prosody-b442c597977063fd641c12aedc21c162685295db.tar.gz prosody-b442c597977063fd641c12aedc21c162685295db.zip |
Merge with Maranda
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions