Merge branch 'refs/heads/main' into frontend · depocoder/YetAnotherCalendar@45f3a26 · GitHub

Commit

Merge branch 'refs/heads/main' into frontend

Browse files

# Conflicts:
#	frontend/src/components/Calendar/DataPicker.jsx
#	frontend/src/pages/CalendarRoute.jsx
#	frontend/src/style/DatePicker.scss
#	frontend/src/utils/dateUtils.js

Loading branch information

depocoder committed Nov 1, 2024

2 parents a3cc901 + 5a7f16c commit 45f3a26