From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 3 Oct 2023 10:48:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/front'
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=73d3296477d3da3be7fd4f5eeb868134aa8be35d;p=pmi.git

Merge remote-tracking branch 'origin/front'

# Conflicts:
#	config/debugbar.php
---

73d3296477d3da3be7fd4f5eeb868134aa8be35d