chore: merge master into feat/issue-21-join-household

Browse Source

Resolved conflicts in HouseholdService, HouseholdController,
V026 migration, and both household test classes in favour of
the more complete invite implementation on this branch.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

This commit was merged in pull request #61.

...

This commit is contained in:

Marcel Raddatz

2026-04-11 00:00:11 +02:00

parent 9a644b5640 b577b7a0f8

commit 32bfcd5c16

2 changed files with 2790 additions and 0 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

1334

specs/staples-settings-redesign.html Normal file

File diff suppressed because it is too large Load Diff

1456

specs/staples-settings-tile.html Normal file

File diff suppressed because it is too large Load Diff