Merge branch v2.10 into v3.0

This commit is contained in:
mmatur 2023-07-24 10:18:23 +02:00 committed by Fernandez Ludovic
commit eb585740a1
27 changed files with 530 additions and 428 deletions

View file

@ -209,6 +209,10 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
return nil, err
}
if staticConfiguration.API != nil {
version.DisableDashboardAd = staticConfiguration.API.DisableDashboardAd
}
// Plugins
pluginBuilder, err := createPluginBuilder(staticConfiguration)