Roland Geider 025c9393cd Merge branch 'master' into feature/exercise-crowdsourcing ...

# Conflicts:
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart

2021-11-03 20:28:06 +01:00

..

auth.dart

Merge branch 'master' of https://github.com/AxelBlaz3/flutter

2021-10-14 09:08:54 +05:30

base_provider.dart

Fixes pt 1

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

body_weight.dart

always_declare_return_types

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

exercises.dart

Merge branch 'master' into feature/exercise-crowdsourcing

2021-10-16 12:40:01 +02:00

gallery.dart

always_declare_return_types

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

helpers.dart

Fixes pt 1

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

measurement.dart

Fixes pt 2

2021-10-01 17:32:31 +02:00

nutrition.dart

Merge branch 'master' into feature/exercise-crowdsourcing

2021-11-03 20:28:06 +01:00

workout_plans.dart

Merge branch 'master' into better-linting-rules-1

2021-10-12 15:11:43 +02:00