Diff

prosody.cfg.lua.dist @ 8046:1bf47706aefb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 02 Apr 2017 00:24:37 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff