Comparison

prosody.cfg.lua.dist @ 6767:d01c29b62b16

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 09 Jul 2015 00:14:27 +0100
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6749:9dc05d3efdc9 6767:d01c29b62b16