Diff

prosody.cfg.lua.dist @ 7450:3ae19750cd46

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 30 May 2016 13:30:53 +0200
parent 7359:a5a080c12c96
child 7517:e81ceca529c5
line wrap: on
line diff