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 /api4/plugin.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 'api4/plugin.go')
| -rw-r--r-- | api4/plugin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/plugin.go b/api4/plugin.go index ee7121ffb..37fbf12cd 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -8,7 +8,7 @@ package api4 import ( "net/http" - l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -17,7 +17,7 @@ const ( ) func (api *API) InitPlugin() { - l4g.Debug("EXPERIMENTAL: Initializing plugin api") + mlog.Debug("EXPERIMENTAL: Initializing plugin api") api.BaseRoutes.Plugins.Handle("", api.ApiSessionRequired(uploadPlugin)).Methods("POST") api.BaseRoutes.Plugins.Handle("", api.ApiSessionRequired(getPlugins)).Methods("GET") |