diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
commit | 9dd235d53bbb77efa67543e0057d093789ca2ddd (patch) | |
tree | 15d7151c2609ac821e0dd08e27f67795300b090d /util/multitable.lua | |
parent | cccb4ab09be9573c02e0d2684e062363cd7eb068 (diff) | |
parent | ed8199402ff2a84e57f256818ebc2c505c2ac41d (diff) | |
download | prosody-9dd235d53bbb77efa67543e0057d093789ca2ddd.tar.gz prosody-9dd235d53bbb77efa67543e0057d093789ca2ddd.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/multitable.lua')
-rw-r--r-- | util/multitable.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/multitable.lua b/util/multitable.lua index 7a2d2b2a..e4321d3d 100644 --- a/util/multitable.lua +++ b/util/multitable.lua @@ -8,7 +8,8 @@ local select = select; local t_insert = table.insert; -local unpack, pairs, next, type = unpack, pairs, next, type; +local pairs, next, type = pairs, next, type; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local _ENV = nil; |