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

Merge remote-tracking branch 'origin/main' into OZG-3563-anbindung-resourceservice-kommentar-shared

# Conflicts:
#	alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping-resource.service.ts
#	alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts
#	alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts
parents a404ad57 2d8e5b09
No related branches found
No related tags found
1 merge request!129OZG-3563-anbindung-resourceservice-kommentar-shared
Showing
with 515 additions and 115 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment