Comparison

prosody.cfg.lua.dist @ 7974:547f000941cf

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 12 Mar 2017 12:52:55 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
comparison
equal deleted inserted replaced
7972:c29de6820fbb 7974:547f000941cf