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

Merge branch 'main' into 'NewPassword' 

# Conflicts:
#   src/components/LoginForm.vue
#   src/router/index.js
parents 05bc1322 9b015ac0
No related branches found
No related tags found
1 merge request!5New password view created and Login view fixed
Pipeline #174845 passed
Stage: build
Stage: test
Stage: deploy