Files
flutter/test/core
Roland Geider f32dec2b08 Merge branch 'master' into feature/offline-mode
# Conflicts:
#	lib/main.dart
#	lib/models/workouts/log.dart
#	lib/models/workouts/session.g.dart
#	lib/providers/exercises.dart
#	lib/providers/gym_state.g.dart
#	lib/providers/wger_base_riverpod.dart
#	lib/screens/dashboard.dart
#	lib/screens/home_tabs_screen.dart
#	lib/widgets/core/app_bar.dart
#	lib/widgets/core/settings.dart
#	lib/widgets/dashboard/calendar.dart
#	lib/widgets/dashboard/widgets/weight.dart
#	lib/widgets/routines/gym_mode/log_page.dart
#	lib/widgets/routines/gym_mode/summary.dart
#	lib/widgets/routines/logs/day_logs_container.dart
#	lib/widgets/routines/logs/exercises_expansion_card.dart
#	pubspec.lock
#	pubspec.yaml
#	test/core/settings_test.dart
#	test/core/settings_test.mocks.dart
#	test/exercises/contribute_exercise_test.mocks.dart
#	test/exercises/exercise_provider_db_test.dart
#	test/exercises/exercise_provider_test.dart
#	test/routine/gym_mode/gym_mode_test.mocks.dart
#	test/routine/routine_logs_screen_test.dart
#	test/routine/routine_logs_screen_test.mocks.dart
#	test/routine/routines_provider_test.mocks.dart
#	test/routine/routines_screen_test.mocks.dart
#	test/weight/weight_provider_test.mocks.dart
#	test/weight/weight_screen_test.mocks.dart
2026-01-19 13:16:55 +01:00
..