Diff

prosody.cfg.lua.dist @ 8003:15973ade9a11

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 24 Mar 2017 00:28:18 +0100
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
line wrap: on
line diff