lama137 d69c7ab525 Merge remote-tracking branch 'origin/Tito' into Zina ...

# Conflicts:
#	lib/database/database.dart
#	lib/model/note.dart
#	lib/model/promemoria.dart
#	lib/navigation.dart

2023-09-28 14:12:20 +02:00

..

Components

grafica pagina TodayView.dart

2023-09-28 11:46:08 +02:00

database

Merge remote-tracking branch 'origin/Tito' into Zina

2023-09-28 14:12:20 +02:00

model

merge

2023-09-28 13:04:42 +02:00

pages

Merge remote-tracking branch 'origin/Tito' into Zina

2023-09-28 14:12:20 +02:00

firebase_options.dart

added firebase

2023-09-27 09:01:14 +02:00

main.dart

IDK

2023-09-28 09:02:52 +02:00

myApp.dart

grafica pagina TodayView.dart

2023-09-28 11:46:08 +02:00

navigation.dart

Merge remote-tracking branch 'origin/Tito' into Zina

2023-09-28 14:12:20 +02:00