Comparison

prosody.cfg.lua.dist @ 6623:0da3e10b3333

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Apr 2015 15:22:33 +0200
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6621:352fa2cae1c9 6623:0da3e10b3333