Merge remote-tracking branch 'refs/remotes/origin/feature/feed'

# Conflicts:
#	lib/features/calendar/presentation/pages/calendar_screen.dart
#	lib/features/diary/presentation/pages/diary_screen.dart
This commit is contained in:
mso7nueh
2024-08-14 11:35:33 +03:00
75 changed files with 3888 additions and 2634 deletions

View File

@@ -11,6 +11,5 @@ class CalendarModel with _$CalendarModel {
Object? diary,
}) = _CalendarModel;
factory CalendarModel.fromJson(Map<String, Object?> json) =>
_$CalendarModelFromJson(json);
factory CalendarModel.fromJson(Map<String, Object?> json) => _$CalendarModelFromJson(json);
}