Diff

prosody.cfg.lua.dist @ 7970:924354a35a02

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 Mar 2017 16:59:21 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff