Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

web/params.go

@@ -181,7 +181,7 @@ func ParamsFromRequest(r *http.Request) *Params {
 		params.Page = val
 	}
 
-	if val, err := strconv.ParseBool(query.Get("permanent")); err != nil {
+	if val, err := strconv.ParseBool(query.Get("permanent")); err == nil {
 		params.Permanent = val
 	}
 

web/web.go

@@ -30,9 +30,9 @@ func NewWeb(a *app.App, root *mux.Router) *Web {
 		MainRouter: root,
 	}
 
-	web.InitStatic()
 	web.InitWebhooks()
 	web.InitSaml()
+	web.InitStatic()
 
 	return web
 }