diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-18 15:00:17 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-18 15:00:17 +0100 |
commit | 03bec1a29092503dd477406236bfe769c48e613c (patch) | |
tree | 41f67d3fa5580f3a6b3421303d78a6c68a5e2ff1 /core/moduleapi.lua | |
parent | b899f5bc37229064d4995ecedde6b8b329db9e3f (diff) | |
parent | e349fb9c87b903509fdef01fbb08e4b1871f96b5 (diff) | |
download | prosody-03bec1a29092503dd477406236bfe769c48e613c.tar.gz prosody-03bec1a29092503dd477406236bfe769c48e613c.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/moduleapi.lua')
-rw-r--r-- | core/moduleapi.lua | 2 |
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; |