# Merge origin/main into codething/53bdee92 · screen/t3code-personal

[View on GitCafe](https://git.cafe/screen/t3code-personal/commit/8a72a2a91d52c16f3f761115d1c49b21fa6cdc4e)

Repository: [screen/t3code-personal](https://git.cafe/screen/t3code-personal)

Visibility: public

Requested revision: 8a72a2a91d52c16f3f761115d1c49b21fa6cdc4e

Requested commit: 8a72a2a91d52c16f3f761115d1c49b21fa6cdc4e

Commit: 8a72a2a91d52c16f3f761115d1c49b21fa6cdc4e

Tree: b1cf20836e92b09979dca45a58d916cc162b188a

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge origin/main into codething/53bdee92

Resolve PR conflicts while preserving route-scoped diff rendering and _chat desktop menu action handling.

Co-authored-by: codex <codex@users.noreply.github.com>

```

## Parents

- [842e327583f214714abbde82e7e19a6341c3d140](https://git.cafe/screen/t3code-personal/commit/842e327583f214714abbde82e7e19a6341c3d140?format=markdown)

- [8cea075a1eb94b574434676122abc5f82e941f43](https://git.cafe/screen/t3code-personal/commit/8cea075a1eb94b574434676122abc5f82e941f43?format=markdown)

[Source at this commit](https://git.cafe/screen/t3code-personal/tree/8a72a2a91d52c16f3f761115d1c49b21fa6cdc4e?format=markdown)