diff core/loggingmanager.lua @ 7950:f91e7ec9654e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 01:14:32 +0100
parents 8acc35b5355a
children 3463d82276de
line wrap: on
line diff
--- a/core/loggingmanager.lua	Fri Mar 03 11:52:22 2017 +0100
+++ b/core/loggingmanager.lua	Mon Mar 06 01:14:32 2017 +0100
@@ -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 =