Diff

prosody.cfg.lua.dist @ 7870:a858066faac6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 27 Jan 2017 12:23:19 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff