]> _ Git - fluidbook-toolbox.git/commitdiff
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)
# Conflicts:
# app/Http/Controllers/Admin/ToolsController.php
# composer.lock
# resources/views/vendor/backpack/base/inc/sidebar_content.blade.php

1  2 
.docker/docker-compose.yml
app/Console/Kernel.php

Simple merge
Simple merge