Comparison

prosody.cfg.lua.dist @ 8049:0909de054b3f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 02 Apr 2017 23:06:27 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
comparison
equal deleted inserted replaced
8046:1bf47706aefb 8049:0909de054b3f