Software / code / prosody
Diff
prosody.cfg.lua.dist @ 7460:726b088f9408
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 24 Jun 2016 15:11:06 +0200 |
| parent | 6345:8e006348d0e5 |
| child | 7359:a5a080c12c96 |
| child | 8258:503f424d4f07 |
