]> _ Git - fluidbook-toolbox.git/commit
Merge branch 'backpack5' into quiz2
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 22 Nov 2023 11:33:23 +0000 (12:33 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 22 Nov 2023 11:33:23 +0000 (12:33 +0100)
commit69561d4d9d57597b0dc9075cdc823559cca38e95
tree62f411d5c7a506cebfde8e8e96592a555c9fcec2
parent6e30c48c9e7aa469a4c37199404661b86e51c246
parent3d45504a28277b7fd0dcbe30ff24132476153e12
Merge branch 'backpack5' into quiz2

# Conflicts:
# app/Http/Controllers/Admin/FluidbookCollectionCrudController.php
# app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
# app/Models/FluidbookCollection.php
# app/Models/FluidbookPublication.php
# app/Models/FluidbookTheme.php
.docker/dev/docker-compose.yml
.docker/docker-compose.yml
app/Console/Commands/WorkshopMigration.php
app/Fluidbook/Compiler/Compiler.php
app/Fluidbook/Packager/Download.php
app/Jobs/FluidbookDocumentUpload.php
app/Models/FluidbookCollection.php
app/Models/FluidbookPublication.php
app/Models/FluidbookTheme.php
composer.lock
public/packages/fluidbook/toolbox/css/style.less