Merge main into develop (resolve conflicts)

Jakub Lachórrequested to merge
merge-main-into-develop into develop

Summary

This MR synchronizes the develop branch with changes from main branch and resolves merge conflicts.

Conflicts resolved

  • Delete/modify conflicts (6 files): Files deleted in develop (App Router migration) but modified in main

    • apps/blog/components/main-page.tsx
    • apps/blog/feature/account-profile/main-page.tsx
    • apps/blog/pages/[param]/feed.tsx
    • apps/blog/pages/[param]/settings.tsx
    • apps/blog/pages/roles/[param].tsx
    • apps/wallet/pages/[param]/settings.tsx
    • Resolution: Keep deletions from develop (App Router migration)

  • votingPOM.spec.ts: Test file conflict

    • Resolution: Keep develop version (simpler, more consistent)

  • pnpm-workspace.yaml: Healthchecker version conflict

    • Resolution: Keep develop version with newer healthchecker (1.28.4-rc0-stable.251202134057)

  • pnpm-lock.yaml: Lockfile conflict

    • Resolution: Keep develop version

After merging this MR

The original MR #737 (closed) (develop → main) should be able to merge without conflicts.

🤖 Generated with Claude Code

Merge request reports