From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 12 Jan 2024 18:23:00 +0000 (+0100)
Subject: Merge branch 'backpack5' into backpack6
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5b241d05f60806c769a534da90a8d755c4a8cb2c;p=cubist_cms-back.git

Merge branch 'backpack5' into backpack6

# Conflicts:
#	composer.json
---

5b241d05f60806c769a534da90a8d755c4a8cb2c