Skip to content
Snippets Groups Projects
Commit a7aa9fac authored by Martin's avatar Martin
Browse files

Merge remote-tracking branch 'origin/main' into OZG-7591-user-roles-fields-validation

# Conflicts:
#	alfa-client/apps/admin-e2e/src/helper/benutzer/benutzer.helper.ts
#	alfa-client/libs/admin/keycloak-shared/src/lib/keycloak.resource.service.spec.ts
#	alfa-client/libs/admin/keycloak-shared/src/lib/keycloak.resource.service.ts
#	alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.ts
#	alfa-client/libs/admin/user/src/lib/user-form/user.formservice.spec.ts
#	alfa-client/libs/admin/user/src/lib/user-form/user.formservice.ts
parents ea1124f5 3b6d95ad
No related branches found
No related tags found
Loading
Showing
with 702 additions and 1261 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment