Diff

prosody.cfg.lua.dist @ 6156:6b1aee6536e8

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 27 Apr 2014 01:02:20 +0200
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
line wrap: on
line diff