Comparison

prosody.cfg.lua.dist @ 6822:621384d89a44

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 03 Sep 2015 23:49:15 +0200
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6820:40d50c239564 6822:621384d89a44