Merge branch 'master' into collabora

2 jobs for collabora in 10 minutes and 14 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
failed lint #103328
allowed to fail

00:08:24

failed test-quick #103329

00:10:13

 
Name Stage Failure
failed
lint Test
store/storetest/team_store.go:631:5: unusedwrite: unused write to field Email (govet)
o2.Email = MakeEmail()
^
store/storetest/team_store.go:632:5: unusedwrite: unused write to field Type (govet)
o2.Type = model.TEAM_OPEN
^
make: *** [Makefile:237: golangci-lint] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
test-quick Test
ok  	github.com/mattermost/mattermost-server/v5/utils/jsonutils	0.004s
? github.com/mattermost/mattermost-server/v5/utils/mocks [no test files]
? github.com/mattermost/mattermost-server/v5/utils/testutils [no test files]
ok github.com/mattermost/mattermost-server/v5/web 0.305s
? github.com/mattermost/mattermost-server/v5/wsapi [no test files]
FAIL
make: *** [Makefile:404: test-server-quick] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 2