Skip to content
Snippets Groups Projects
Commit 2282dbe3 authored by Kristiane Skogvang Kolshus's avatar Kristiane Skogvang Kolshus
Browse files

Merge branch 'questions_endpoint' into 'frontend-editQuiz-requests' 

# Conflicts:
#   FullstackProsjekt/src/frontend/src/components/shared/create-quiz/EditQuizView.vue
#   FullstackProsjekt/src/frontend/src/views/ProfileView.vue
parents 8f8a81ea 098ebde2
Branches
No related tags found
2 merge requests!50Questions endpoint,!47Repair editQuiz functionality
Pipeline #270064 passed
Stage: build
Stage: test
Stage: package