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

Merge branch 'master' into OZG-6423-Upgrade-Angular-18

# Conflicts:
#	alfa-client/libs/admin/settings/src/lib/user/user.repository.spec.ts
#	alfa-client/libs/admin/settings/test/user/user.ts
#	alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
#	alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.spec.ts
#	alfa-client/libs/design-system/src/test/search.ts
#	alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
#	alfa-client/package-lock.json
#	alfa-client/package.json
#	alfa-client/tsconfig.base.json
parents 79847df1 780b7d34
No related branches found
No related tags found
Loading
Showing
with 431 additions and 72 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment