Diff

prosody.cfg.lua.dist @ 7263:015a711a8ccf

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Mar 2016 17:55:40 +0000
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
line wrap: on
line diff