]> _ Git - fluidbook-toolbox.git/commit
Merge branch 'backpack5' into quiz2
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 7 Nov 2023 06:31:16 +0000 (07:31 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 7 Nov 2023 06:31:16 +0000 (07:31 +0100)
commitd525a95908947893d35ecc3b85ac3fe049d42ea6
tree94b8693e914243e46b6ac2556520ddf7b187f413
parent36052e464a61589c3164f1947cc35530a5146bf2
parentcd8332c0f84048e50e6709f2410f503409a733ef
Merge branch 'backpack5' into quiz2

# Conflicts:
# composer.json
# composer.lock
.docker/dev/docker-compose.yml
.docker/docker-compose.yml
app/Fluidbook/Packager/Download.php
app/Models/FluidbookPublication.php
composer.json
package-lock.json