Skip to content
Snippets Groups Projects
Commit 845442ce authored by Albert Bruns's avatar Albert Bruns
Browse files

Merge branch 'main' into OZG-3563-anbindung-resourceservice-kommentar-shared

# Conflicts:
#	alfa-client/libs/bescheid-shared/src/lib/bescheid-resource-service.ts
#	alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
#	alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
#	alfa-client/libs/command-shared/src/lib/command.model.ts
#	alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts
#	alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts
#	alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.spec.ts
#	alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.ts
#	alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang/kommentar-list-item-in-vorgang/kommentar-list-item-in-vorgang.component.html
#	alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.ts
parents 5de47cb4 3b6d95ad
No related branches found
No related tags found
1 merge request!129OZG-3563-anbindung-resourceservice-kommentar-shared
Showing
with 467 additions and 209 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment