Comparison

prosody.cfg.lua.dist @ 8440:4e6710b4f873

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 01 Dec 2017 04:54:23 +0100
parent 8285:433b2a41351f
child 9590:6d4da1b4b6f4
comparison
equal deleted inserted replaced
8439:293dbb08427b 8440:4e6710b4f873