Comparison

prosody.cfg.lua.dist @ 8043:e7561d56008d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 01 Apr 2017 22:38:02 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
comparison
equal deleted inserted replaced
8039:1f4bd8009961 8043:e7561d56008d