diff options
| author | Kim Alvefur <zash@zash.se> | 2022-10-20 16:56:45 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-10-20 16:56:45 +0200 |
| commit | 8fc457681e6dacf2272f4a8e3c1994623c2eab5a (patch) | |
| tree | 11d2e79503b234af8a8fc6fc23b30cc556f1cff3 /util | |
| parent | 98da2af369892b6f2889d2a00949014f5db3d3a0 (diff) | |
| parent | bab0635179f291387505721d2a9acc7f9086d7cd (diff) | |
| download | prosody-8fc457681e6dacf2272f4a8e3c1994623c2eab5a.tar.gz prosody-8fc457681e6dacf2272f4a8e3c1994623c2eab5a.zip | |
Merge 0.12->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/startup.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua index e2e7db09..10ff1875 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -132,6 +132,7 @@ end 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 @@ end function startup.load_secondary_libraries() --- Load and initialise core modules - require "util.import" require "util.xmppstream" require "core.stanza_router" require "core.statsmanager" |