Milan Paunovic 10565ceb39 Merge branch 'dp/calendar-sync' into dev ...

# Conflicts:
#	components/pages/settings/CalendarSettingsPage.tsx
#	yarn.lock

2024-10-06 00:07:24 +02:00

..

user_settings_views

changes to calendar and UI

2024-10-05 23:41:44 +02:00

CalendarSettingsPage.tsx

Merge branch 'dp/calendar-sync' into dev

2024-10-06 00:07:24 +02:00

ChoreRewardSettings.tsx

added settings pages

2024-09-19 21:38:37 +02:00

SettingsPage.tsx

Merge branch 'dev'

2024-09-29 23:04:17 +02:00

UserSettings.tsx

changes to calendar and UI

2024-10-05 23:41:44 +02:00