Merge branch 'master' into feature/gym-mode

Browse Source

# Conflicts:
#	integration_test/3_gym_mode.dart
#	ios/Podfile.lock
#	lib/screens/gym_mode.dart
#	pubspec.yaml

...

This commit is contained in:

Roland Geider

2025-12-02 12:32:06 +01:00

parent b291329350 86034e1a98

commit 56cdffb010

458 changed files with 1100 additions and 606 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

BIN

test/routine/goldens/routine_logs_screen_detail.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 9.8 KiB

BIN

test/routine/goldens/routine_screen_detail.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 8.9 KiB