Felix Kirchner 3e3def0bde Merge remote-tracking branch 'origin/feature/29-timestamp-zu-allen-objekten-hinzufügen' into feature/31-json-import-fuer-testdaten ...

# Conflicts:
#	lib/data/dao/game_dao.dart
#	lib/data/db/database.g.dart
#	lib/data/db/tables/game_table.dart
#	lib/data/dto/game.dart
#	pubspec.yaml

2025-11-19 19:30:56 +01:00

..

dao

Merge remote-tracking branch 'origin/feature/29-timestamp-zu-allen-objekten-hinzufügen' into feature/31-json-import-fuer-testdaten

2025-11-19 19:30:56 +01:00

db

Merge remote-tracking branch 'origin/feature/29-timestamp-zu-allen-objekten-hinzufügen' into feature/31-json-import-fuer-testdaten

2025-11-19 19:30:56 +01:00

dto

Merge remote-tracking branch 'origin/feature/29-timestamp-zu-allen-objekten-hinzufügen' into feature/31-json-import-fuer-testdaten

2025-11-19 19:30:56 +01:00