aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-22 14:33:18 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-22 14:33:18 +0100
commitc8d21f63aec906c72eb2e97ded9e8459a93fac56 (patch)
treecad2cfc2b92d19767b0aeef7752b85b54623d09d /prosody.cfg.lua.dist
parenta8da45a1b9aca9dae8e2d9ceeb491815716df340 (diff)
parent840cf714cfef934759c0a1dfffda1d5fc5b2d2f5 (diff)
downloadprosody-c8d21f63aec906c72eb2e97ded9e8459a93fac56.tar.gz
prosody-c8d21f63aec906c72eb2e97ded9e8459a93fac56.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions