From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 19 Sep 2023 14:37:42 +0000 (+0200)
Subject: Merge branch 'backpack5' into quiz2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e5768d97dc1c9d60ff835da563988f6e69f3a797;p=fluidbook-toolbox.git

Merge branch 'backpack5' into quiz2

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

e5768d97dc1c9d60ff835da563988f6e69f3a797