Diff

prosody.cfg.lua.dist @ 7605:2481ebc7f715

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 Aug 2016 17:36:46 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff