mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 15:49:35 +00:00

# Conflicts: # go.mod # go.sum # internal/api/grpc/oidc/v2/integration_test/oidc_test.go # internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go # internal/api/grpc/session/v2/session.go # internal/api/grpc/session/v2beta/session.go # internal/api/grpc/session/v2beta/session_test.go # internal/api/scim/integration_test/testdata/users_replace_test_minimal_with_email_type.json # internal/api/scim/integration_test/users_create_test.go # internal/api/scim/integration_test/users_get_test.go # internal/api/scim/integration_test/users_replace_test.go # internal/api/scim/integration_test/users_update_test.go # internal/queue/queue.go