Merge branch 'master' into nats

This commit is contained in:
Neil Alexander 2021-11-24 12:04:32 +00:00
commit 95476d36ca
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
28 changed files with 489 additions and 60 deletions

View file

@ -180,7 +180,7 @@ func TestValidationOfApplicationServices(t *testing.T) {
// Set up a config
fakeConfig := &config.Dendrite{}
fakeConfig.Defaults()
fakeConfig.Defaults(true)
fakeConfig.Global.ServerName = "localhost"
fakeConfig.ClientAPI.Derived.ApplicationServices = []config.ApplicationService{fakeApplicationService}