Comparison

prosody.cfg.lua.dist @ 7747:0e442402cebc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Nov 2016 01:06:23 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
comparison
equal deleted inserted replaced
7745:6d6a04628954 7747:0e442402cebc