]> _ Git - cubist_cms-back.git/commitdiff
Merge branch 'backpack5' into backpack6
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 12 Jan 2024 18:23:00 +0000 (19:23 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 12 Jan 2024 18:23:00 +0000 (19:23 +0100)
# Conflicts:
# composer.json

1  2 
src/app/CubistCrudPanel.php

Simple merge