]> _ Git - fluidbook-toolbox.git/commitdiff
projects / fluidbook-toolbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a617b24 a36cd31)
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 patch | diff1 | diff2 | blob | history
app/Console/Kernel.php patch | diff1 | diff2 | blob | history

diff --cc .docker/docker-compose.yml
Simple merge
diff --cc app/Console/Kernel.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.