aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-07 19:18:50 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-07 19:18:50 +0000
commitf48883b6ab37867f687aa6279f43da6a56cd40f1 (patch)
treeac0e72316d86c2f578943a42491152bb8276e9c5 /prosody.cfg.lua.dist
parent2e6fcdb2d0126ddf6dac449d950ffbf5c7c523ba (diff)
parentd3e7e2f1a7007f79edd38daf0adcf63e4fe950e3 (diff)
downloadprosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.tar.gz
prosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions