Merge branch 'main' of https://git.blaishome.online/blaisadmin/FlockPal

# Conflicts:
#	backend/src/repositories/birdRepository.ts

backend/src/types.ts

@@ -106,6 +106,9 @@ export type BirdRow = {
   gotcha_day: string | null;
   chart_color: string;
   photo_data_url: string | null;
+  photo_object_key: string | null;
+  photo_content_type: string | null;
+  photo_updated_at: string | null;
   notify_on_dob: boolean;
   notify_on_gotcha_day: boolean;
   memorialized_at: string | null;