aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-03 14:59:55 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-03 14:59:55 +0000
commit2b9a7ef7b48519a64f64268f4b4169c601175e93 (patch)
tree0a45f803690602626615b39fd3c0b17e3df266e7 /prosody.cfg.lua.dist
parentab8006e6152db2531cfc65fbfa4de95efa570d6d (diff)
parentd3b6588fd79e85777cf5c6af4fd870c297dc7daf (diff)
downloadprosody-2b9a7ef7b48519a64f64268f4b4169c601175e93.tar.gz
prosody-2b9a7ef7b48519a64f64268f4b4169c601175e93.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions