Diff

prosody.cfg.lua.dist @ 6149:2ae6e9063e88

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Wed, 23 Apr 2014 00:22:36 +0200
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
line wrap: on
line diff