Diff

prosody.cfg.lua.dist @ 8101:3e25d96571d1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Apr 2017 00:41:49 +0200
parent 7517:e81ceca529c5
child 8268:e21d82551e05
line wrap: on
line diff