]> _ Git - fluidbook-toolbox.git/commit
Merge remote-tracking branch 'origin/backpack5' into backpack5
authorsoufiane <soufiane@cubedesigners.com>
Thu, 30 Nov 2023 14:37:15 +0000 (15:37 +0100)
committersoufiane <soufiane@cubedesigners.com>
Thu, 30 Nov 2023 14:37:15 +0000 (15:37 +0100)
commitb82b88947218157683e261954895382cd2096193
tree5ccad59073047b2efe632de7a21a8a0312357a5b
parent171f838914b635bde45d0a7e6091aa57908dd6e3
parent691c973e901f79c95bfea0e5f091563a598c8a4d
Merge remote-tracking branch 'origin/backpack5' into backpack5

# Conflicts:
# app/Console/Commands/FluidbookCollection.php
# app/Console/Commands/FluidbookPackage.php
# app/Console/Commands/WorkshopMigration.php
# app/Console/Kernel.php
app/Http/Controllers/Admin/Operations/ContentTranslate/ExcelImportOperation.php
app/Jobs/Base.php
composer.lock
public/packages/fluidbook/toolbox/css/style.less