Software / code / prosody
Diff
prosody.cfg.lua.dist @ 6908:047becf393ca
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:31:43 +0200 |
| parent | 6345:8e006348d0e5 |
| child | 7359:a5a080c12c96 |
| child | 8258:503f424d4f07 |
