Diff

prosody.cfg.lua.dist @ 7798:74cfec1fe5a2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 01 Jan 2017 19:35:06 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff