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

Merge remote-tracking branch 'origin/main' into OZG-725-ui-styling

# Conflicts:
#	alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts
#	alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
parents 0d5b009e 3b6d95ad
No related branches found
No related tags found
Loading
Showing
with 682 additions and 186 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment