Diff

prosody.cfg.lua.dist @ 9586:44dbee2f173f

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Oct 2018 17:17:07 +0100 (2018-10-28)
parent 8285:433b2a41351f
child 9590:6d4da1b4b6f4
line wrap: on
line diff