Diff

prosody.cfg.lua.dist @ 6145:69bc9dfcbd89

Merge daurnimator->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 21 Apr 2014 17:42:44 +0100
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
line wrap: on
line diff