diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
| commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
| tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /api/api.go | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
| download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api/api.go')
| -rw-r--r-- | api/api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/api.go b/api/api.go index 70f36db85..2b226bbeb 100644 --- a/api/api.go +++ b/api/api.go @@ -6,9 +6,9 @@ package api import ( "net/http" - l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" _ "github.com/nicksnyder/go-i18n/i18n" @@ -114,7 +114,7 @@ func Init(a *app.App, root *mux.Router) *API { a.InitEmailBatching() if *a.Config().ServiceSettings.EnableAPIv3 { - l4g.Info("API version 3 is scheduled for deprecation. Please see https://api.mattermost.com for details.") + mlog.Info("API version 3 is scheduled for deprecation. Please see https://api.mattermost.com for details.") } return api |