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

# Conflicts:
#	lib/models/workouts/log.dart
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart

2022-10-10 15:50:50 +02:00

..

app

Merge branch 'master' into feature/exercise-crowdsourcing

2022-10-10 15:50:50 +02:00

gradle/wrapper

Update build.gradle

2021-05-01 15:13:33 +02:00

.gitignore

Move fastlane folder to root

2021-12-06 17:23:29 +01:00

build.gradle

Bump some versions, build app with flutter 2.10

2022-02-19 21:47:07 +01:00

Gemfile

Start implementing automatic builds

2021-04-21 10:04:07 +02:00

gradle.properties

first push

2020-09-12 20:25:00 +10:00

settings.gradle

first push

2020-09-12 20:25:00 +10:00