Roland Geider b60e19cb16 Merge branch 'master' into feature/ingredient-images ...

# Conflicts:
#	lib/main.dart
#	lib/providers/nutrition.dart
#	pubspec.yaml
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart

2023-03-20 13:58:31 +01:00

..

exceptions

Fixes pt 1

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

helpers

Some polishing

2023-02-06 22:31:35 +01:00

l10n

Translated using Weblate (Ukrainian)

2023-03-18 02:46:19 +01:00

models

Merge branch 'master' into feature/ingredient-images

2023-03-20 13:58:31 +01:00

providers

Merge branch 'master' into feature/ingredient-images

2023-03-20 13:58:31 +01:00

screens

Polish the last exercise submission step

2023-02-10 17:15:29 +01:00

theme

Improved Login Interface #264

2022-10-20 23:32:31 +05:30

widgets

Merge branch 'master' into feature/ingredient-images

2023-03-20 13:58:31 +01:00

main.dart

Pass BaseProvider as an argument to workout provider

2023-02-11 13:45:42 +01:00