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 | 90252e8dcc284a3213ae738052c6b6d95628eea7 (patch) | |
| tree | 41f67d3fa5580f3a6b3421303d78a6c68a5e2ff1 /core/loggingmanager.lua | |
| parent | f0979385d306fc2c20ba995b29e7b4e0e43f6c15 (diff) | |
| parent | cecd6ca31df847722dc98eb88d374bc58f3020c8 (diff) | |
| download | prosody-90252e8dcc284a3213ae738052c6b6d95628eea7.tar.gz prosody-90252e8dcc284a3213ae738052c6b6d95628eea7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/loggingmanager.lua')
| -rw-r--r-- | core/loggingmanager.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 14dd4360..e3a83817 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -16,7 +16,8 @@ local math_max, rep = math.max, string.rep; local os_date = os.date; local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; local tostring = tostring; -local select, unpack = select, table.unpack or unpack; +local select = select; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local config = require "core.configmanager"; local logger = require "util.logger"; |