Software / code / prosody
Diff
prosody.cfg.lua.dist @ 6690:b2e89583d6e6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 May 2015 22:33:40 +0200 |
| parent | 6345:8e006348d0e5 |
| child | 7359:a5a080c12c96 |
| child | 8258:503f424d4f07 |
