Merge branch 'development' into feature/168-teamspiele-implementieren

Browse Source

# Conflicts:
#	lib/l10n/arb/app_de.arb
#	lib/l10n/arb/app_en.arb
#	lib/l10n/generated/app_localizations.dart
#	lib/l10n/generated/app_localizations_de.dart
#	lib/l10n/generated/app_localizations_en.dart
#	pubspec.yaml

...

This commit is contained in:

Felix Kirchner

2026-05-23 00:18:31 +02:00

parent 47829a6955 811079705f

commit cf7dbe60f4

12 changed files with 3799 additions and 193 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1431

pubspec.lock Normal file

File diff suppressed because it is too large Load Diff