# Merge remote-tracking branch 'origin/main' into test/web-test-audit · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 7b47897f81695d01a3108f14face541c07a5c0e6

Requested commit: 7b47897f81695d01a3108f14face541c07a5c0e6

Commit: 7b47897f81695d01a3108f14face541c07a5c0e6

Tree: 72b59f55eabbd3522205b0b08174a561d9a76980

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into test/web-test-audit

# Conflicts:
#	apps/web/src/components/chat/ThreadDetailsPrRow.browser.test.tsx
#	apps/web/src/components/diffs/StyledDiffCodeView.browser.test.tsx

```

## Parents

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

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

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