]> _ Git - fluidbook-toolbox.git/commit
Merge branch 'backpack5' into serverExt
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 22 Nov 2023 11:42:38 +0000 (12:42 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 22 Nov 2023 11:42:38 +0000 (12:42 +0100)
commitdd3dc2aa75209af6dd7e4268058c0ed84d3a6963
treeea8c2e96742fae59fb6d6c1df385a68b5aba2c6f
parenta64e38188470fc234d118884b5c1aec0e6edb9ac
parent3d45504a28277b7fd0dcbe30ff24132476153e12
Merge branch 'backpack5' into serverExt

# Conflicts:
# app/Models/FluidbookCollection.php
# app/Models/FluidbookPublication.php
.docker/dev/docker-compose.yml
.docker/docker-compose.yml
app/Console/Commands/WorkshopMigration.php
app/Fluidbook/Packager/Download.php
app/Jobs/FluidbookDocumentUpload.php
app/Models/FluidbookExternalInstallServer.php