]> _ Git - fluidbook-toolbox.git/commit
Merge branch 'backpack5' of git.cubedesigners.com:fluidbook-toolbox into quiz2
authorsoufiane <soufiane@cubedesigners.com>
Mon, 20 Nov 2023 10:10:08 +0000 (11:10 +0100)
committersoufiane <soufiane@cubedesigners.com>
Mon, 20 Nov 2023 10:10:08 +0000 (11:10 +0100)
commit879f8c45006cc9323b7513ac17694eaab0f50b6b
treecd2bae35114475e02dfdc7efd431a9141e4e30ab
parentf662e74b5786b66d0d9b5f6fc75b44755f86f4fa
parentc206cc4d5d2d8f44ef8b1c787f1706470ac753aa
Merge branch 'backpack5' of git.cubedesigners.com:fluidbook-toolbox into quiz2

# Conflicts:
# app/Http/Controllers/Admin/FluidbookCollectionCrudController.php
# app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
# app/Models/FluidbookTheme.php
app/Models/FluidbookCollection.php
app/Models/FluidbookPublication.php
composer.lock
public/packages/fluidbook/toolbox/css/style.less