aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-24 16:52:12 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-24 16:52:12 +0100
commit558778062f4d7fa6e406c243062d1fe2dd3ade9b (patch)
tree3ba6d294204def13ec5e9bd1c0efba118e547dca /prosody.cfg.lua.dist
parent5e08b2f64d0b9b4ed9b234f96a0138c0de3da40b (diff)
parent9449a9f03656354a04bd6d08eeb367ca9bf717ef (diff)
downloadprosody-558778062f4d7fa6e406c243062d1fe2dd3ade9b.tar.gz
prosody-558778062f4d7fa6e406c243062d1fe2dd3ade9b.zip
Merge 0.7->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions