Skip to content
Snippets Groups Projects
Commit bd803b22 authored by Jens Christian Aanestad's avatar Jens Christian Aanestad
Browse files

Merge branch 'main' into documentation/Javadoc 

# Conflicts:
#	src/components/BaseComponents/NavBar.vue
#	src/components/Shop/ItemShop.vue
#	src/views/BankID/RedirectView.vue
parents be2ff496 18923ccd
No related branches found
No related tags found
1 merge request!100Documentation/javadoc
Pipeline #284950 failed
Stage: install
Stage: build
Stage: test
Stage: lint
Stage: docker_build_and_push
Stage: deploy_docker