diff prosody.cfg.lua.dist @ 6354:bbb4a82db32e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Aug 2014 19:22:08 +0200
parents 8e006348d0e5
children a5a080c12c96 503f424d4f07
line wrap: on
line diff