summaryrefslogtreecommitdiffstats
path: root/mlog
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-11 08:05:23 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-11 08:05:23 -0400
commit91557bbd978500388a11b99401783164e143a966 (patch)
tree676d6278d957df20f21d5e367d1f447ee281414e /mlog
parent11c60ea41afd419036edc54b5571f26ce680c93c (diff)
parent2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff)
downloadchat-91557bbd978500388a11b99401783164e143a966.tar.gz
chat-91557bbd978500388a11b99401783164e143a966.tar.bz2
chat-91557bbd978500388a11b99401783164e143a966.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'mlog')
-rw-r--r--mlog/log.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/mlog/log.go b/mlog/log.go
index ad537a11d..28f7408c4 100644
--- a/mlog/log.go
+++ b/mlog/log.go
@@ -29,6 +29,7 @@ type Field = zapcore.Field
var Int64 = zap.Int64
var Int = zap.Int
var String = zap.String
+var Any = zap.Any
var Err = zap.Error
type LoggerConfiguration struct {