Diff

prosody.cfg.lua.dist @ 7788:cf1d7e35a160

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 15 Dec 2016 13:24:53 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff