Roland Geider 2d8d864f27 Merge branch 'master' into feature/exercise-crowdsourcing ...

# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.dart
#	lib/providers/exercises.dart
#	lib/providers/nutrition.dart
#	lib/widgets/exercises/exercises.dart
#	lib/widgets/workouts/forms.dart
#	lib/widgets/workouts/gym_mode.dart
#	pubspec.lock
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/gym_mode_screen_test.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.dart
#	test/workout_set_form_test.mocks.dart

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

..

consts.dart

Merge branch 'master' into feature/exercise-crowdsourcing

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

gym_mode.dart

Fixes pt 1

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

json.dart

const_constructors

2021-10-07 20:40:09 +02:00

misc.dart

If no wger API key is present launch a browser so they can register manually

2021-10-10 19:15:43 +02:00

ui.dart

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

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