Comparison

prosody.cfg.lua.dist @ 7467:9a73c85baffe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Jul 2016 15:12:44 +0200
parent 7359:a5a080c12c96
child 7517:e81ceca529c5
comparison
equal deleted inserted replaced
7465:f1923f00b7de 7467:9a73c85baffe