Skip to content

Conversation

rolandgeider
Copy link
Member

@rolandgeider rolandgeider commented Aug 9, 2022

At the moment this requires the feature/ingredient-images branch on the backend

@rolandgeider rolandgeider linked an issue Aug 9, 2022 that may be closed by this pull request
@rolandgeider
Copy link
Member Author

Depends on wger-project/wger#653

# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.g.dart
#	lib/widgets/core/core.dart
#	pubspec.lock
#	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
# Conflicts:
#	lib/main.dart
#	lib/providers/nutrition.dart
#	pubspec.yaml
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart
@rolandgeider rolandgeider merged commit f220ea5 into master Apr 8, 2023
@rolandgeider rolandgeider deleted the feature/ingredient-images branch April 8, 2023 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add ingredient images
1 participant