From: Blackeye <14815724-Blackstareye@users.noreply.gitlab.com>
Date: Mon, 19 Aug 2024 12:35:12 +0000 (+0000)
Subject: Merge branch 'next-release' into 'f_modularization_wip_rebased'
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/d00f70e3fa9a3a15bf4d9ba09eaa11bb8868bda7?hp=d00f70e3fa9a3a15bf4d9ba09eaa11bb8868bda7

Merge branch 'next-release' into 'f_modularization_wip_rebased'

# Conflicts:
#   index.php
---