Commit 0b94f6c4 authored by Jakub Lachór's avatar Jakub Lachór
Browse files

Merge branch 'main' into develop

Resolve conflicts:
- Keep deleted files from develop (App Router migration)
- Keep develop version of votingPOM.spec.ts test
- Keep develop version of pnpm-workspace.yaml (newer healthchecker)
- Keep develop version of pnpm-lock.yaml

🤖 Generated with [Claude Code](https://claude.com/claude-code

)

Co-Authored-By: default avatarClaude Opus 4.5 <noreply@anthropic.com>
parents f7fd86b1 3993b5cf
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment