Diff

prosody.cfg.lua.dist @ 6167:5af7fe1014db

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 09 May 2014 23:28:09 +0200
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
line wrap: on
line diff