]> _ Git - fluidbook-toolbox-quiz.git/commit
Merge remote-tracking branch 'origin/mobile-master'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 28 Sep 2023 08:48:44 +0000 (10:48 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 28 Sep 2023 08:48:44 +0000 (10:48 +0200)
commit951a80c7ae4a7a041cbdd0d5515129274c1c73e1
treedab85d541281206e8b8fae6cafbd27fdce433be3
parent7cd9fe5a03c10075bf2fbf3ef563642910eb72b4
parent9880ed3987f0762ca730ebb7592c546f6cfaf2a6
Merge remote-tracking branch 'origin/mobile-master'

# Conflicts:
# style/103-question-multiple.sass
# views/screens/question_match.blade.php
js/quiz.match.js
style/103-question-multiple.sass
style/107-question-match.sass
views/screens/question_match.blade.php