_ Git - cubist_cms-back.git/commit

author	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Fri, 12 Jan 2024 18:23:00 +0000 (19:23 +0100)
committer	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Fri, 12 Jan 2024 18:23:00 +0000 (19:23 +0100)
commit	5b241d05f60806c769a534da90a8d755c4a8cb2c
tree	531c73effcfa7fcc6af56ca9c35aec6b0f61fcf2	tree \| snapshot
parent	7266c5e29b8f3b57281ad8ac7130d854fa2b6ade	commit \| diff
parent	4b4697d5f6f5d1502aa7b52b18dbd700a412a472	commit \| diff

Merge branch 'backpack5' into backpack6

# Conflicts:
# composer.json

Unnamed repository; edit this file 'description' to name the repository.