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

Merge remote-tracking branch 'origin/master' into OZG-5012-GenerischerResourceService

# Conflicts:
#	alfa-client/libs/admin-settings/src/lib/admin-settings.module.ts
#	alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
#	alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
#	alfa-client/libs/admin-settings/src/lib/postfach/postfach.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/index.ts
#	alfa-client/libs/tech-shared/src/index.ts
#	alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts
#	alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts
#	alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts
#	alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts
#	alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
#	alfa-client/libs/tech-shared/test/marbles.ts
parents 4e72a568 643d41a0
No related branches found
No related tags found
Loading
Showing
with 256 additions and 70 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment