]> _ Git - fluidbook-toolbox.git/commit
Merge branch 'backpack5' into quiz2
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 19 Sep 2023 14:37:42 +0000 (16:37 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 19 Sep 2023 14:37:42 +0000 (16:37 +0200)
commite5768d97dc1c9d60ff835da563988f6e69f3a797
treea241ffb8a2c745ce130a333820f106bd22b5962e
parenta617b24a72043fb9e5a88c2c18622cbb7f073bbd
parenta36cd31134c54bef966c0169fadb5a26774c9aa9
Merge branch 'backpack5' into quiz2

# Conflicts:
# app/Http/Controllers/Admin/ToolsController.php
# composer.lock
# resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
.docker/docker-compose.yml
app/Console/Kernel.php