Skip to content
Snippets Groups Projects
Commit 3f87d6ce authored by Ina Martini's avatar Ina Martini
Browse files

Merge branch 'dev' into 'feat/startpage/design-start-page' 

# Conflicts:
#   src/router/index.ts
parents 32f15002 82dd49d0
No related branches found
No related tags found
3 merge requests!66Final merge,!11Feat/startpage/design start page,!4Pipeline fix
Pipeline #276132 failed
Stage: install
Stage: lint_and_format
Stage: build
Stage: test
Stage: security_scan
Hide whitespace changes
Inline Side-by-side
Showing
with 357 additions and 69 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment