Roland Geider 8543652581 Merge branch 'master' into feature/measurements ...

# Conflicts:
#	lib/screens/dashboard.dart
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart

2021-09-07 17:03:15 +02:00

..

core

Show units in weight and measurement charts

2021-09-07 15:59:35 +02:00

dashboard

Add measurement entries in the dashboard calendar

2021-09-06 18:33:54 +02:00

exercises

Automatic linting

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

gallery

Replace getImage with pickImage, was deprecated

2021-09-01 15:46:31 +02:00

measurements

Some improvements to the link to the measurement sub page

2021-09-07 16:48:03 +02:00

nutrition

Merge remote-tracking branch 'origin/feature/measurements' into feature/measurements

2021-08-25 21:34:22 +02:00

weight

Merge branch 'master' into feature/measurements

2021-09-07 17:03:15 +02:00

workouts

Merge branch 'master' into feature/measurements

2021-09-07 17:03:15 +02:00

app_drawer.dart

Automatic linting

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