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

Browse Source

# Conflicts:
#	lib/presentation/views/main_menu/match_view/match_result_view.dart
#	pubspec.yaml

...

This commit is contained in:

Felix Kirchner

2026-05-23 00:40:46 +02:00

parent cf7dbe60f4 4eb485e40a

commit 047c4e88d3

10 changed files with 665 additions and 821 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

1266

lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart

File diff suppressed because it is too large Load Diff