Skip to content
Snippets Groups Projects
Commit 4327b1b0 authored by Heine Mærde Brakstad's avatar Heine Mærde Brakstad
Browse files

Merge branch 'main' into 'addition'

# Conflicts:
#   FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuizController.java
parents 832a6281 79d0501d
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
with 129 additions and 134 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment