diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
| commit | f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7 (patch) | |
| tree | d3899b890408f6f16b2d5f543bf975475f1a5584 /cmd | |
| parent | 51bd710ecdca6628461c9fa2679737073e4d5059 (diff) | |
| parent | a1656dffa98fbc8865e476b214e4e0c562547d39 (diff) | |
| download | chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.gz chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.bz2 chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commands/server.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/commands/server.go b/cmd/commands/server.go index 77f195f4b..441eb82bc 100644 --- a/cmd/commands/server.go +++ b/cmd/commands/server.go @@ -107,7 +107,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan api4.Init(a, a.Srv.Router, false) api3 := api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) - web.Init(api3) + web.NewWeb(a, a.Srv.Router) license := a.License() |