Joshua e3b7926fa4 Merge remote-tracking branch 'origin/feature/Back' into feature/Back
# Conflicts:
#	templates/gestion_user/index.html.twig
#	templates/index/cuisinier.html.twig
2024-11-21 15:03:10 +01:00
..