mirror of
https://github.com/bjc/prosody.git
synced 2025-04-06 22:57:38 +03:00
Merge with Florob
This commit is contained in:
commit
81bef2c93b
50 changed files with 648 additions and 435 deletions
|
@ -14,8 +14,6 @@ local logger = require "util.logger";
|
|||
local pluginloader = require "util.pluginloader";
|
||||
local timer = require "util.timer";
|
||||
|
||||
local multitable_new = require "util.multitable".new;
|
||||
|
||||
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
|
||||
local error, setmetatable, type = error, setmetatable, type;
|
||||
local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
|
||||
|
@ -338,4 +336,4 @@ function api:load_resource(path, mode)
|
|||
return io.open(path, mode);
|
||||
end
|
||||
|
||||
return api;
|
||||
return api;
|
Loading…
Add table
Add a link
Reference in a new issue