Skip to content
Snippets Groups Projects
Commit 77716018 authored by Titus Netland's avatar Titus Netland
Browse files

Merge branch 'main' into 'remove-vuetify' 

# Conflicts:
#   src/components/LoginForm.vue
#   src/router/index.js
parents 9129a822 ee55c738
No related branches found
No related tags found
1 merge request!7Remove vuetify
Pipeline #175312 passed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
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