Comparison

prosody.cfg.lua.dist @ 7327:d62f0471470f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 02 Apr 2016 17:13:12 +0200
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
7324:7e6409462f79 7327:d62f0471470f