Diff

prosody.cfg.lua.dist @ 8051:b2681397bafa

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 03 Apr 2017 00:59:44 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff