Diff

prosody.cfg.lua.dist @ 6605:03a43bf3ecd2

Merge with merge
author Kim Alvefur <zash@zash.se>
date Fri, 27 Mar 2015 00:28:16 +0100
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
line wrap: on
line diff