Skip to content
Snippets Groups Projects
Commit 78e86021 authored by Ingrid Martinsheimen Egge's avatar Ingrid Martinsheimen Egge :cow2:
Browse files

Merge remote-tracking branch 'origin/profilinnstillinger' into profilinnstillinger 

# Conflicts:
#	src/components/EditProfile.vue
#	src/components/Navbar.vue
parents 18c68ba3 3fba3e17
No related branches found
No related tags found
1 merge request!21Merge profilinnstillinger into main
Hide whitespace changes
Inline Side-by-side
Showing
with 379 additions and 38 deletions
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