# Merge remote-tracking branch 'origin/main' into fix/issue-20366 · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/6f2d6c63e3f252651c0221c8a3dcf9d9f950dbbd)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: 6f2d6c63e3f252651c0221c8a3dcf9d9f950dbbd

Requested commit: 6f2d6c63e3f252651c0221c8a3dcf9d9f950dbbd

Commit: 6f2d6c63e3f252651c0221c8a3dcf9d9f950dbbd

Tree: 67929c9494296acb13557e7b21453e586f611350

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into fix/issue-20366

# Conflicts:
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/chat/MessagesTimeline.browser.test.tsx

```

## Parents

- [da7573a5fc4aea23b8ede26dfd743124a18998c3](https://git.cafe/pingdotgg/t3code/commit/da7573a5fc4aea23b8ede26dfd743124a18998c3?format=markdown)

- [8d3b061121fe65669d5d43d011b48cd3027a4108](https://git.cafe/pingdotgg/t3code/commit/8d3b061121fe65669d5d43d011b48cd3027a4108?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/6f2d6c63e3f252651c0221c8a3dcf9d9f950dbbd?format=markdown)