merge conflict resolved

AAU-P5-Moodle · Nov 27, 2024 · 723fbc8 · 723fbc8
2 parents d18fb48 + cd4da15
commit 723fbc8
Show file tree

Hide file tree

Showing 48 changed files with 2,309 additions and 313 deletions.
diff --git a/server/moodle/mod/livequiz/amd/build/question.min.js b/server/moodle/mod/livequiz/amd/build/question.min.js
diff --git a/server/moodle/mod/livequiz/amd/build/question.min.js.map b/server/moodle/mod/livequiz/amd/build/question.min.js.map
diff --git a/server/moodle/mod/livequiz/amd/build/question_editor.min.js b/server/moodle/mod/livequiz/amd/build/question_editor.min.js