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

..

exceptions

Fixes pt 1

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

helpers

Merge branch 'master' into feature/exercise-crowdsourcing

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

l10n

Merge branch 'master' into feature/exercise-crowdsourcing

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

models

Merge branch 'master' into feature/exercise-crowdsourcing

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

providers

Merge branch 'master' into feature/exercise-crowdsourcing

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

screens

Merge branch 'master' into feature/exercise-crowdsourcing

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

theme

Fix app bar color

2021-11-03 19:55:26 +01:00

widgets

Merge branch 'master' into feature/exercise-crowdsourcing

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

main.dart

Merge conflicts

2021-10-16 12:41:33 +02:00