Diff

prosody.cfg.lua.dist @ 8157:4947e84f2e5b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 27 May 2017 17:30:16 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff