aboutsummaryrefslogtreecommitdiffstats
path: root/core/moduleapi.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-18 15:00:17 +0100
committerKim Alvefur <zash@zash.se>2016-02-18 15:00:17 +0100
commit90252e8dcc284a3213ae738052c6b6d95628eea7 (patch)
tree41f67d3fa5580f3a6b3421303d78a6c68a5e2ff1 /core/moduleapi.lua
parentf0979385d306fc2c20ba995b29e7b4e0e43f6c15 (diff)
parentcecd6ca31df847722dc98eb88d374bc58f3020c8 (diff)
downloadprosody-90252e8dcc284a3213ae738052c6b6d95628eea7.tar.gz
prosody-90252e8dcc284a3213ae738052c6b6d95628eea7.zip
Merge 0.10->trunk
Diffstat (limited to 'core/moduleapi.lua')
-rw-r--r--core/moduleapi.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 14e5771b..8db5c218 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -23,7 +23,7 @@ local ipairs, pairs, select = ipairs, pairs, select;
local tonumber, tostring = tonumber, tostring;
local require = require;
local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
-local unpack = table.unpack or unpack; -- renamed in 5.2
+local unpack = table.unpack or unpack; --luacheck: ignore 113 -- renamed in 5.2
local prosody = prosody;
local hosts = prosody.hosts;