Software / code / prosody
Diff
prosody.cfg.lua.dist @ 6576:b7796a46aec2
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Feb 2015 10:34:56 +0100 |
| parent | 6345:8e006348d0e5 |
| child | 7359:a5a080c12c96 |
| child | 8258:503f424d4f07 |
