Comparison

prosody.cfg.lua.dist @ 7900:41f783d4e127

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 15 Feb 2017 23:05:03 +0100
parent 7517:e81ceca529c5
child 8268:e21d82551e05
comparison
equal deleted inserted replaced
7892:f00943bbf84f 7900:41f783d4e127