Diff

prosody.cfg.lua.dist @ 7046:6b4232125f32

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 04 Jan 2016 09:09:15 +0000
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
line wrap: on
line diff