Skip to content
Snippets Groups Projects
Commit e87194d8 authored by Trygve Jørgensen's avatar Trygve Jørgensen
Browse files

Merge remote-tracking branch 'origin/dev' into enhancement/project-cleanup 

# Conflicts:
#	src/views/ManageProfileView.vue
parents 04ae54a1 bc555ea9
No related branches found
No related tags found
3 merge requests!66Final merge,!52Change password and routing fix,!4Pipeline fix
Pipeline #283328 passed
Stage: install
Stage: lint_and_format
Stage: build
Stage: test
Stage: security_scan
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