Software / code / prosody
Diff
prosody.cfg.lua.dist @ 6572:c60c199cc7f0
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 31 Jan 2015 12:25:24 +0000 |
| parent | 6345:8e006348d0e5 |
| child | 7359:a5a080c12c96 |
| child | 8258:503f424d4f07 |
