aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-10-05 12:16:28 -0400
committerMatthew Wild <mwild1@gmail.com>2013-10-05 12:16:28 -0400
commit8754e4be8504fbdbdd796818d2ce68bb02e104e5 (patch)
tree9344408f15cd0951aad0c621076ac09fb81d539a /prosody.cfg.lua.dist
parentfa21be14b2c444aa7848c401e2be40bdd101e67a (diff)
parent841a59e0e13f566e3c2f324f8c54470dbec0e8e9 (diff)
downloadprosody-8754e4be8504fbdbdd796818d2ce68bb02e104e5.tar.gz
prosody-8754e4be8504fbdbdd796818d2ce68bb02e104e5.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions