Milan Paunovic 848211c3c8 Merge branch 'dev' ...

# Conflicts:
#	app/(auth)/_layout.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
#	yarn.lock

2024-11-04 00:26:18 +01:00

..

GroupsList.tsx

added settings pages

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

MyGroup.tsx

Profile picture upload added, QR code scan fix

2024-11-01 04:34:59 +01:00

MyProfile.tsx

Merge branch 'dev'

2024-11-04 00:26:18 +01:00

UserMenu.tsx

Added ask your family message

2024-11-01 04:38:42 +01:00