Mercurial > prosody-hg
diff util/startup.lua @ 9136:07fc2c5c0c2e
Merge jonasw->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Aug 2018 16:58:21 +0200 |
| parents | b10a37f6f75f |
| children | 8b2b8f1a911f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Aug 2018 16:58:21 +0200 |
| parents | b10a37f6f75f |
| children | 8b2b8f1a911f |