JOSSERAND GIOVANNI p2405212 c233d4cda3 Merge branch 'dev' into 'features/searchBar' ...

# Conflicts:
#   src/components/Event/Event.jsx
#   src/index.css
#   src/pages/Events/EventsPage.jsx
#   src/utils/getUser.js
#   src/utils/getXSRF.js
#   src/utils/login.js
#   src/utils/register.js

2025-12-07 15:43:03 +00:00

..

Event.jsx

Merge branch 'dev' into 'features/searchBar'

2025-12-07 15:43:03 +00:00

Event.module.css

Merge branch 'dev' into 'features/searchBar'

2025-12-07 15:43:03 +00:00