Roland Geider
|
5beedf05b3
|
Merge branch 'fix/terminology'
# Conflicts:
# lib/widgets/routines/day.dart
# lib/widgets/routines/forms.dart
# lib/widgets/routines/log.dart
# lib/widgets/routines/routines_list.dart
# lib/widgets/routines/workout_logs.dart
# test/routine/gym_mode_screen_test.mocks.dart
# test/routine/repetition_unit_form_widget_test.mocks.dart
# test/routine/weight_unit_form_widget_test.mocks.dart
# test/routine/workout_day_form_test.mocks.dart
# test/routine/workout_form_test.mocks.dart
# test/routine/workout_plan_screen_test.mocks.dart
# test/routine/workout_plans_screen_test.mocks.dart
# test/routine/workout_provider_test.mocks.dart
# test/routine/workout_set_form_test.mocks.dart
|
2023-11-09 20:44:02 +01:00 |
|