Comparison

prosody.cfg.lua.dist @ 8379:2a0915aa6131

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 07 Nov 2017 09:29:04 +0100
parent 8285:433b2a41351f
child 9590:6d4da1b4b6f4
comparison
equal deleted inserted replaced
8377:58cdbbe3b86a 8379:2a0915aa6131