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

Merge branch 'OZG-6301-Nach-Organisationseinheiten-suchen' into...

Merge branch 'OZG-6301-Nach-Organisationseinheiten-suchen' into OZG-6305-AnzeigeOrganisationsEinheit

# Conflicts:
#	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-form/collaboration-request-form.component.html
#	alfa-client/libs/collaboration/src/lib/collaboration.module.ts
#	alfa-client/libs/collaboration/src/lib/organisations-einheit-in-collaboration-container/organisations-einheit-in-collaboration-container.component.html
#	alfa-client/libs/collaboration/src/lib/organisations-einheit-in-collaboration-container/organisations-einheit-in-collaboration-container.component.spec.ts
#	alfa-client/libs/collaboration/src/lib/organisations-einheit-in-collaboration-container/organisations-einheit-in-collaboration-container.component.ts
parents 733fef2e ddbf6acb
Branches
Tags
Loading
Showing
with 194 additions and 44 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment