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

Merge branch 'refs/heads/master' into OZG-6720-nacharbeiten

# Conflicts:
#	alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts
parents 8889f641 99f6de34
No related branches found
No related tags found
No related merge requests found
Showing
with 31 additions and 38 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment