Merge branch 'dev' into 'features/volunteersTollBar'

# Conflicts:
#   src/pages/Events/EventsPage.jsx
#   src/pages/Volunteers/VolunteerCard.jsx
This commit is contained in:
JOSSERAND GIOVANNI p2405212 committed 2025-12-10 10:54:24 +00:00
commit cac2ef2c3e
25 files changed
+715 -75

No files matched your search

-1
View File
@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
import Event from "../../components/Event/Event.jsx";
import styles from "./EventsPage.module.css";
import ToolBar from "../../components/ToolBar/ToolBar.jsx";
import filter from "../../utils/filter.js";
import getAllEvents from "../../utils/event/getAllEvents.js";