Comparison

prosody.cfg.lua.dist @ 8909:dbb5ec6885fe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Jun 2018 17:56:38 +0200
parent 8285:433b2a41351f
child 9590:6d4da1b4b6f4
comparison
equal deleted inserted replaced
8906:f15e35458ecc 8909:dbb5ec6885fe