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
1 merge request!37javadoc and testclasses for backend
Pipeline #269505 passed