Milan Paunovic c726081b96 Merge branch 'dev' ...

# Conflicts:
#	app/(auth)/calendar/index.tsx
#	yarn.lock

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

..

user_settings_views

LOgging in with qr code added

2024-09-29 23:03:21 +02:00

CalendarSettingsPage.tsx

added settings pages

2024-09-19 21:38:37 +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

ver bump

2024-09-28 08:59:05 +02:00