Diff

prosody.cfg.lua.dist @ 7146:c793f9d13a36

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 05 Feb 2016 16:31:34 +0100
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
line wrap: on
line diff