Software / code / prosody
Changeset
12780:2c0c1b18a02b
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Oct 2022 16:56:45 +0200 |
| parents | 12778:6163c8b17ea9 (current diff) 12779:f0474d40364c (diff) |
| children | 12781:22066b02887f |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/startup.lua Wed Oct 19 14:34:41 2022 +0200 +++ b/util/startup.lua Thu Oct 20 16:56:45 2022 +0200 @@ -132,6 +132,7 @@ function startup.load_libraries() -- Load socket framework -- luacheck: ignore 111/server 111/socket + require "util.import" socket = require "socket"; server = require "net.server" end @@ -359,7 +360,6 @@ function startup.load_secondary_libraries() --- Load and initialise core modules - require "util.import" require "util.xmppstream" require "core.stanza_router" require "core.statsmanager"
