Comparison

prosody.cfg.lua.dist @ 7697:bd854e762875

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 16 Oct 2016 00:39:10 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
comparison
equal deleted inserted replaced
7694:bffbea1187ca 7697:bd854e762875