Skip to content
Snippets Groups Projects
Verified Commit 7955b0c8 authored by Sebastian Bergandy's avatar Sebastian Bergandy :keyboard:
Browse files

Merge branch 'main' into OZG-7590-Administration-neue-Rolle

# Conflicts:
#	alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts
#	alfa-client/apps/admin-e2e/src/e2e/main-tests/organisationseinheiten/organisationseinheiten-hinzufuegen.cy.ts
#	alfa-client/apps/admin-e2e/src/e2e/main-tests/organisationseinheiten/organisationseinheiten-laden.cy.ts
parents f0863ea4 3d4bdbd7
Branches
Tags
Loading
Showing
with 441 additions and 75 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment