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

Merge remote-tracking branch 'origin/ozg-6300-accordion-zusammenarbeit' into...

Merge remote-tracking branch 'origin/ozg-6300-accordion-zusammenarbeit' into OZG-6302-AnfrageFormular

# Conflicts:
#	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.html
#	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts
#	alfa-client/libs/collaboration/src/lib/collaboration.module.ts
parents ec5fdb36 df2ee8d8
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment