diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-10-10 22:27:01 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-10-10 22:27:01 +0100 |
commit | b8308a01ffae00c3a0c9a9557036d6760c1cad57 (patch) | |
tree | 7ed25791ef2b73508310bd47230d070eaba5c02b /prosody.cfg.lua.dist | |
parent | a732f8846e7fcb81ca1e098b0f73fd394d11df54 (diff) | |
parent | fd4afeecb7be4bce7141a883cbfcb878c61af18d (diff) | |
download | prosody-b8308a01ffae00c3a0c9a9557036d6760c1cad57.tar.gz prosody-b8308a01ffae00c3a0c9a9557036d6760c1cad57.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions