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

Merge branch 'OZG-7590-Administration-neue-Rolle' of...

Merge branch 'OZG-7590-Administration-neue-Rolle' of code.schleswig-holstein.de:ozg-cloud/app/frontend-clients 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/benutzer_rollen/benutzer-anlegen.cy.ts
#	alfa-client/apps/admin-e2e/src/e2e/main-tests/benutzer_rollen/benutzer_rollen.cy.ts
#	alfa-client/apps/admin-e2e/src/support/user-util.ts
parents ac01a6f2 05816a60
No related branches found
No related tags found
Loading
Showing
with 366 additions and 142 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment