diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:23:58 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:23:58 +0100 |
commit | d90814ef61e537efb472dfe186524b254594dc62 (patch) | |
tree | 46089956a4bc673ded328e7a665b0fc34acd65a9 /prosody.cfg.lua.dist | |
parent | 649aa772aadb66ccd8773e81c6981be057a3addb (diff) | |
parent | a684be25dba02b42f21cd45373bf55b70ab368a8 (diff) | |
download | prosody-d90814ef61e537efb472dfe186524b254594dc62.tar.gz prosody-d90814ef61e537efb472dfe186524b254594dc62.zip |
Merge 0.6->0.7
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions