diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-13 13:53:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 13:53:37 -0500 |
| commit | 97558f6a6ec4c53fa69035fb430ead209d9c222d (patch) | |
| tree | 6fc57f5b75b15a025348c6e295cea6aedb9e69ae /web/web.go | |
| parent | 07bad4d6d518a9012a20fec8309cd625f57c7a8c (diff) | |
| download | chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.gz chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.bz2 chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.zip | |
PLT-4938 Add app package and move logic over from api package (#4931)
* Add app package and move logic over from api package
* Change app package functions to return errors
* Move non-api tests into app package
* Fix merge
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index d1a181d73..1ee216d55 100644 --- a/web/web.go +++ b/web/web.go @@ -11,6 +11,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/api" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" "github.com/mssola/user_agent" @@ -19,7 +20,7 @@ import ( func InitWeb() { l4g.Debug(utils.T("web.init.debug")) - mainrouter := api.Srv.Router + mainrouter := app.Srv.Router if *utils.Cfg.ServiceSettings.WebserverMode != "disabled" { staticDir := utils.FindDir(model.CLIENT_DIR) |