Software /
code /
prosody
Comparison
prosody.cfg.lua.dist @ 6871:e4b5885b7712
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 25 Sep 2015 18:11:45 +0200 |
parent | 6345:8e006348d0e5 |
child | 7359:a5a080c12c96 |
child | 8258:503f424d4f07 |
comparison
equal
deleted
inserted
replaced
6868:dcf9ceac9265 | 6871:e4b5885b7712 |
---|