Diff

prosody.cfg.lua.dist @ 7516:f74ff35a4b03

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Jul 2016 18:58:58 +0200
parent 7359:a5a080c12c96
child 7517:e81ceca529c5
line wrap: on
line diff