]> _ Git - fluidbook-toolbox.git/commit
Merge branch 'backpack5' into quiz2
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 7 Sep 2023 10:29:39 +0000 (12:29 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 7 Sep 2023 10:29:39 +0000 (12:29 +0200)
commitc7d382216504eb55c252468d548d417fc03bc180
tree7feddc21483f4cc5212c704f6e720f6b8b5891f1
parentc7f5c3a45ea1a71427bb77743863895a3797d4d3
parent762d9c46e903e5fd34a624aa21c27d3e805a383a
Merge branch 'backpack5' into quiz2

# Conflicts:
# app/Models/ElearningTranslate.php