From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Sun, 30 Apr 2023 09:53:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/backpack4.1' into backpack5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=71b31bd9090e3db1a09736f7e597113ffd793ca2;p=fluidbook-toolbox.git

Merge remote-tracking branch 'origin/backpack4.1' into backpack5

# Conflicts:
#	.docker/images/php/Dockerfile
#	app/Console/Kernel.php
#	composer.json
#	composer.lock
---

71b31bd9090e3db1a09736f7e597113ffd793ca2
diff --cc .env.dev
index d43ff5699,31625a6e5..3fe996659
--- a/.env.dev
+++ b/.env.dev
@@@ -48,7 -46,10 +48,8 @@@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_C
  
  SCORM_CLOUD_APP_ID=VAAROP2RFR
  SCORM_CLOUD_SECRET_KEY=7PHpD9pQk4aIjUnlKgF8s89CGlhkIucZHJ3zMXuQ
+ SCORM_CLOUD_PREFIX=toolbox_dev_
  
 -SLACK_BOT_TOKEN=xoxb-12192359685-3923048219394-EXUQIBSc3VTO6RKr3Plrn1um
 -
  BACKPACK_LOCALES=en,fr
  TIMEZONE=Europe/Paris