Diff

prosody.cfg.lua.dist @ 7957:083c062c2fb7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 15:31:21 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff