aboutsummaryrefslogtreecommitdiffstats
path: root/core/loggingmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
commitca65f0d2d3718301b880c0260c991cd8ee7977ae (patch)
treee58db2bf464bf09301a9c02c27330c2dba6b926d /core/loggingmanager.lua
parentb133b78d47ff180110b0b29612d3cd257a9972c1 (diff)
parente45c5961ac42007aa6c9282afddff91cd1e27124 (diff)
downloadprosody-ca65f0d2d3718301b880c0260c991cd8ee7977ae.tar.gz
prosody-ca65f0d2d3718301b880c0260c991cd8ee7977ae.zip
Merge 0.10->trunk
Diffstat (limited to 'core/loggingmanager.lua')
-rw-r--r--core/loggingmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index e3a83817..14305588 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -5,7 +5,7 @@
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-
+-- luacheck: globals log prosody.log
local format = string.format;
local setmetatable, rawset, pairs, ipairs, type =