]> _ Git - fluidbook-toolbox.git/commit
Merge remote-tracking branch 'origin/quiz2' into quiz2
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 28 Jul 2023 14:53:23 +0000 (16:53 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 28 Jul 2023 14:53:23 +0000 (16:53 +0200)
commit24b61fb545cc0cb83e02ae2e02366a5df59de6be
tree4cd55f3f4ed80fd1f3af99237ee29eb0b2d35365
parent27af8aac8ddb35e98db71419fd417baf0f8ed0e7
parent338ce134888a0068576cf80e8fb96364a7878264
Merge remote-tracking branch 'origin/quiz2' into quiz2

# Conflicts:
# resources/quizv2/js/quiz.animations.js
resources/quizv2/js/quiz.animations.js
resources/quizv2/js/quiz.js