]> _ Git - cubist_cms-back.git/commitdiff
projects / cubist_cms-back.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7266c5e 4b4697d)
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 patch | diff1 | diff2 | blob | history

diff --cc src/app/CubistCrudPanel.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.