]> _ Git - fluidbook-toolbox.git/commitdiff
Merge remote-tracking branch 'origin/backpack4.1' into backpack5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Sun, 30 Apr 2023 09:53:57 +0000 (11:53 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Sun, 30 Apr 2023 09:53:57 +0000 (11:53 +0200)
# Conflicts:
# .docker/images/php/Dockerfile
# app/Console/Kernel.php
# composer.json
# composer.lock

1  2 
.docker/images/php/Dockerfile
.env.dev
.env.prod

Simple merge
diff --cc .env.dev
index d43ff569981e10f0e4ad5b061ea052b6b00b3e13,31625a6e571ce4f2ff75ad987c6135faff825c49..3fe99665939c7ccaaf1e209b3205b9795fac1635
+++ 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
  
diff --cc .env.prod
Simple merge