Roland Geider f7ac8b716b Merge branch 'master' into 12people-master ...

# Conflicts:
#	lib/widgets/nutrition/widgets.dart
#	pubspec.lock

2023-04-09 10:57:43 +02:00

..

exceptions

Fixes pt 1

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

helpers

Fixing bug #293

2023-03-22 17:29:22 +01:00

l10n

Translated using Weblate (Spanish)

2023-04-05 00:39:00 +02:00

models

Merge branch 'master' into feature/ingredient-images

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

providers

Merge branch 'master' into 12people-master

2023-04-09 10:57:43 +02:00

screens

Platform conditions for image_picker library

2023-03-22 11:55:36 +01:00

theme

Improved Login Interface #264

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

widgets

Merge branch 'master' into 12people-master

2023-04-09 10:57:43 +02:00

main.dart

Fix merge errors

2023-03-20 14:19:29 +01:00