]> _ Git - fluidbook-toolbox.git/commit
Merge remote-tracking branch 'origin/backpack4.1' into backpack5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Sat, 6 May 2023 09:29:38 +0000 (11:29 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Sat, 6 May 2023 09:29:38 +0000 (11:29 +0200)
commitfcf6ca88c27419b8756918f19d2192aeed0af031
tree155714172e81ee178f5bb3cfa8b537a16b8fb406
parentd25e9a5aa1b6a6f67f3b1eca2e26e257a6682144
parent758e1012fb4a918416b67084039e83dc2e9ac9d7
Merge remote-tracking branch 'origin/backpack4.1' into backpack5

# Conflicts:
# composer.lock
.docker/images/php/Dockerfile
app/Fluidbook/Compiler/Compiler.php
resources/linkeditor/js/linkeditor.links.js