From: Dominik Kaiser <141638109+dpu-kaiser@users.noreply.github.com>
Date: Wed, 15 May 2024 10:36:00 +0000 (+0200)
Subject: Merge collision into master
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=012afb95fd1cb5c7e625b4b023c98573c0e0499f;p=42%2Fso_long.git

Merge collision into master

Collision
---

012afb95fd1cb5c7e625b4b023c98573c0e0499f