mirror of
https://github.com/wger-project/flutter.git
synced 2026-02-18 23:42:00 +01:00
badc3257d0
# Conflicts: # assets/images/muscles/back.svg # assets/images/muscles/main/muscle-1.svg # assets/images/muscles/main/muscle-10.svg # assets/images/muscles/main/muscle-11.svg # assets/images/muscles/main/muscle-12.svg # assets/images/muscles/main/muscle-13.svg # assets/images/muscles/main/muscle-14.svg # assets/images/muscles/main/muscle-15.svg # assets/images/muscles/main/muscle-16.svg # assets/images/muscles/main/muscle-2.svg # assets/images/muscles/main/muscle-3.svg # assets/images/muscles/main/muscle-4.svg # assets/images/muscles/main/muscle-5.svg # assets/images/muscles/main/muscle-6.svg # assets/images/muscles/main/muscle-7.svg # assets/images/muscles/main/muscle-8.svg # assets/images/muscles/main/muscle-9.svg # assets/images/muscles/secondary/muscle-1.svg # assets/images/muscles/secondary/muscle-10.svg # assets/images/muscles/secondary/muscle-11.svg # assets/images/muscles/secondary/muscle-12.svg # assets/images/muscles/secondary/muscle-13.svg # assets/images/muscles/secondary/muscle-14.svg # assets/images/muscles/secondary/muscle-15.svg # assets/images/muscles/secondary/muscle-16.svg # assets/images/muscles/secondary/muscle-2.svg # assets/images/muscles/secondary/muscle-3.svg # assets/images/muscles/secondary/muscle-4.svg # assets/images/muscles/secondary/muscle-5.svg # assets/images/muscles/secondary/muscle-6.svg # assets/images/muscles/secondary/muscle-7.svg # assets/images/muscles/secondary/muscle-8.svg # assets/images/muscles/secondary/muscle-9.svg # lib/helpers/consts.dart # lib/l10n/app_en.arb # lib/models/exercises/exercise.dart # lib/models/exercises/exercise.g.dart # lib/providers/exercises.dart # lib/widgets/exercises/exercises.dart # pubspec.lock # pubspec.yaml # test/exercises/exercises_detail_widget_test.dart # test/nutrition/nutritional_plan_form_test.mocks.dart # test/workout/workout_set_form_test.mocks.dart