Mercurial > prosody-hg
comparison prosody.cfg.lua.dist @ 6962:2bb6586eacdd
Merge...
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 03 Dec 2015 16:46:24 +0100 |
| parents | 8e006348d0e5 |
| children | a5a080c12c96 503f424d4f07 |
comparison
equal
deleted
inserted
replaced
| 6956:82baf2609cbe | 6962:2bb6586eacdd |
|---|