Diff

prosody.cfg.lua.dist @ 7525:bad62a7f461f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 27 Jul 2016 15:05:54 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff