Skip to content
Snippets Groups Projects
Commit be6383bc authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-4310-Admin-Benutzer-anlegen

# Conflicts:
#	alfa-client/apps/admin-e2e/src/e2e/main-tests/benutzer_rollen/benutzer_rollen.cy.ts
#	alfa-client/apps/admin/src/app/app.component.spec.ts
parents 6f937d8b f4b2dd83
No related branches found
No related tags found
No related merge requests found
Showing
with 505 additions and 166 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment