Roland Geider 2119c26ad3 Merge branch 'master' into feature/exercise-crowdsourcing ...

# Conflicts:
#	.github/workflows/ci.yml
#	lib/models/exercises/comment.g.dart
#	lib/models/exercises/exercise.g.dart
#	lib/models/exercises/image.g.dart
#	lib/models/measurements/measurement_entry.g.dart
#	lib/models/nutrition/ingredient_weight_unit.g.dart
#	lib/models/nutrition/log.g.dart
#	lib/models/workouts/day.g.dart
#	lib/models/workouts/session.g.dart
#	lib/models/workouts/workout_plan.g.dart
#	lib/providers/exercises.dart
#	pubspec.lock
#	pubspec.yaml
#	test/utils.dart
#	test/workout/gym_mode_screen_test.dart

2022-01-15 12:58:02 +01:00

..

day.dart

Fixes pt 1

2021-10-01 17:18:17 +02:00

day.g.dart

Upgrade dependencies and recreate generated files

2021-11-10 15:16:25 +01:00

log.dart

Minor changes

2021-10-07 19:58:56 +02:00

log.g.dart

Upgrade dependencies and recreate generated files

2021-11-10 15:16:25 +01:00

repetition_unit.dart

Automatic linting

2021-06-22 21:10:15 +00:00

repetition_unit.g.dart

Merge branch 'master' into feature/exercise-crowdsourcing

2022-01-15 12:58:02 +01:00

session.dart

always_declare_return_types

2021-10-07 20:43:55 +02:00

session.g.dart

Automatic linting

2021-11-10 14:19:52 +00:00

set.dart

Make order of sets a required attribute

2021-10-28 11:43:32 +02:00

set.g.dart

Upgrade dependencies and recreate generated files

2021-11-10 15:16:25 +01:00

setting.dart

Fixes pt 1

2021-10-01 17:18:17 +02:00

setting.g.dart

Upgrade dependencies and recreate generated files

2021-11-10 15:16:25 +01:00

weight_unit.dart

Automatic linting

2021-06-22 21:10:15 +00:00

weight_unit.g.dart

Merge branch 'master' into feature/exercise-crowdsourcing

2022-01-15 12:58:02 +01:00

workout_plan.dart

Fixes pt 1

2021-10-01 17:18:17 +02:00

workout_plan.g.dart

Automatic linting

2021-11-10 14:19:52 +00:00