diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-12-17 21:38:16 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-12-17 21:38:16 +0000 |
commit | 31d67aa507d7f7cb4037da66be6cfde221af6678 (patch) | |
tree | abcc39583d56f2ecde7137e9eb66978e0d228c3c /prosody.cfg.lua.dist | |
parent | 8c41e630056a2d94786df8311161f779527abcf2 (diff) | |
parent | 851ac94df24d3329274099002bb0c7296322bfbb (diff) | |
download | prosody-31d67aa507d7f7cb4037da66be6cfde221af6678.tar.gz prosody-31d67aa507d7f7cb4037da66be6cfde221af6678.zip |
Merge with backout branch
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions