Merge branch 'main' into feature/port-forwarding

# Conflicts:
#	integrations/integrations.go
This commit is contained in:
bcmmbaga
2025-02-25 10:40:25 +00:00
+1 -2
View File
@@ -13,8 +13,8 @@ import (
"github.com/netbirdio/netbird/management/server"
"github.com/netbirdio/netbird/management/server/activity"
"github.com/netbirdio/netbird/management/server/activity/sqlite"
"github.com/netbirdio/netbird/management/server/integrated_validator"
"github.com/netbirdio/netbird/management/server/integrations/integrated_validator"
"github.com/netbirdio/netbird/management/server/jwtclaims"
)
func RegisterHandlers(
@@ -22,7 +22,6 @@ func RegisterHandlers(
prefix string,
router *mux.Router,
accountManager server.AccountManager,
extractor *jwtclaims.ClaimsExtractor,
integratedValidator integrated_validator.IntegratedValidator,
meter metric.Meter,
permissionsManager permissions.Manager,