diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
| commit | bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7 (patch) | |
| tree | 3a37db7b805b1555d08cc61c7938cf512ff35ce0 /util/timer.lua | |
| parent | 2940b9c66f4a053dbe2ca038468a3a8791beccd5 (diff) | |
| parent | bd3bd2179be360f86c7db3fcd400dbb168fa8be5 (diff) | |
| download | prosody-bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7.tar.gz prosody-bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util/timer.lua')
| -rw-r--r-- | util/timer.lua | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util/timer.lua b/util/timer.lua index 4670e196..cbfc1992 100644 --- a/util/timer.lua +++ b/util/timer.lua @@ -16,6 +16,11 @@ local tostring = tostring; local xpcall = require "util.xpcall".xpcall; local math_max = math.max; +if server.timer then + -- The selected net.server implements this API, so defer to that + return server.timer; +end + local _ENV = nil; -- luacheck: std none |