From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Sun, 18 Aug 2024 15:53:20 +0000 (+0200)
Subject: Merge branch 'master' into next-release
X-Git-Tag: 4.6.1~21
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/5aa1e87de607c31282dec602978624de9e636cba

Merge branch 'master' into next-release

This will fix the history after commit 4efa531d in master
---

5aa1e87de607c31282dec602978624de9e636cba