Skip to content
Snippets Groups Projects
Commit cf54b6d3 authored by Jan Zickermann's avatar Jan Zickermann
Browse files

Merge remote-tracking branch 'origin/master' into OZG-4993-Organisationseinheit-Input-Validation

# Conflicts:
#	alfa-client/libs/admin-settings/src/lib/keycloak/keycloak.model.ts
#	alfa-client/libs/admin-settings/src/lib/keycloak/keycloak.util.ts
#	alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
#	alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
#	alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.spec.ts
#	alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.ts
parents 5b04382e ec69b718
Branches
Tags
No related merge requests found
Showing
with 664 additions and 561 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment