Diff

prosody.cfg.lua.dist @ 6327:5a63f489dcc6

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 31 Jul 2014 07:14:54 +0100
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
line wrap: on
line diff