aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-19 15:36:31 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-19 15:36:31 +0100
commit76bffb99b8cbfef4173443cc864469ba86452e03 (patch)
tree98bb2c521888e4c1af567103a1936cc33c5dc880 /prosody.cfg.lua.dist
parent9462cf30c6b16db4b6ac9814f8b06ede8611ccae (diff)
parent7adc50d2fdbe6086f43a6f125aafac86cb8d2ed0 (diff)
downloadprosody-76bffb99b8cbfef4173443cc864469ba86452e03.tar.gz
prosody-76bffb99b8cbfef4173443cc864469ba86452e03.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions