Diff

prosody.cfg.lua.dist @ 7534:ba782a093b14

Merge 0.10 -> trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 29 Jul 2016 14:58:42 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff