aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-03-27 22:11:58 +0000
committerMatthew Wild <mwild1@gmail.com>2015-03-27 22:11:58 +0000
commit29f906c30d10ce983b6c034d88bf7a3c8b576bb0 (patch)
tree05c689e53d3416f52f0e9c782cf05887e5fe14da /prosody.cfg.lua.dist
parent13edf3e093fd656d5110b277eca4c9805f3d925c (diff)
parent51bef3673c57c5a2e323a7eb1424c85498905f53 (diff)
downloadprosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.tar.gz
prosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.zip
Merge 0.9->0.10 (third time lucky)
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions