Skip to content
Snippets Groups Projects
Commit 953871ac authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-4560-Alfa-Frontend-umbenennen

# Conflicts:
#	goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-vorpruefen.cy.ts
#	goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-search-view.cy.ts
#	goofy-client/libs/command-shared/src/lib/+state/command.facade.spec.ts
#	goofy-client/libs/command-shared/src/lib/command.service.spec.ts
#	goofy-client/libs/command-shared/src/lib/command.service.ts
#	goofy-client/libs/forwarding-shared/src/lib/forwarding.service.spec.ts
#	goofy-client/libs/forwarding-shared/src/lib/forwarding.util.spec.ts
#	goofy-client/libs/forwarding-shared/src/lib/forwarding.util.ts
#	goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.html
#	goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
#	goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
#	goofy-client/libs/vorgang-shared/src/lib/vorgang.service.spec.ts
#	goofy-client/libs/vorgang-shared/src/lib/vorgang.service.ts
#	goofy-client/libs/vorgang-shared/src/lib/vorgang.util.spec.ts
#	goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-view-item-container/vorgang-view-item/vorgang-view-item.component.html
#	goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-view-item-container/vorgang-view-item/vorgang-view-item.component.spec.ts
#	goofy-client/pom.xml
parents 11c066fb 227abc85
No related branches found
No related tags found
No related merge requests found
Showing
with 278 additions and 69 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment