diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
| commit | 5fa1b3581955761bd39c310bc88b1489d963a9fc (patch) | |
| tree | 25e6dd11592102807abebbb5de100f7d867005d8 /web | |
| parent | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (diff) | |
| parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
| download | chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.gz chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.bz2 chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'web')
| -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 22fe43923..c9d318397 100644 --- a/web/web.go +++ b/web/web.go @@ -5,6 +5,7 @@ package web import ( "net/http" + "path/filepath" "strings" "github.com/NYTimes/gziphandler" @@ -102,5 +103,5 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "no-cache, max-age=31556926, public") staticDir, _ := utils.FindDir(model.CLIENT_DIR) - http.ServeFile(w, r, staticDir+"root.html") + http.ServeFile(w, r, filepath.Join(staticDir, "root.html")) } |