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
Loading
Pipeline #174845 passed
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment