Skip to content
Snippets Groups Projects
Commit 7da8bab7 authored by Henrik Teksle Sandok's avatar Henrik Teksle Sandok
Browse files

Merge branch 'main' into 'Badges' 

# Conflicts:
#   spec.json
#   src/components/BaseComponents/NavBar.vue
parents f2a19046 f3f0eab4
No related branches found
No related tags found
1 merge request!80feat: Adding badges and menu selected visual
Pipeline #283382 passed with warnings
Stage: install
Stage: build
Stage: test
Stage: lint