Comparison

prosody.cfg.lua.dist @ 6887:da38775bda82

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 27 Sep 2015 00:36:34 +0200
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6886:27f5a76e3fa5 6887:da38775bda82