Comparison

prosody.cfg.lua.dist @ 6603:e702ae7aa3d9

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 26 Mar 2015 16:49:03 +0000
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6588:93423244dc5b 6603:e702ae7aa3d9