# Merge remote-tracking branch 'origin/main' into feat/preview-load-error-v2 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: e4dc55b6918ccb7a90fde053aa4a837cecae586f

Requested commit: e4dc55b6918ccb7a90fde053aa4a837cecae586f

Commit: e4dc55b6918ccb7a90fde053aa4a837cecae586f

Tree: 932bd3574cb8f3746bb1959e13dae0af37bcd9de

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into feat/preview-load-error-v2

# Conflicts:
#	apps/desktop/src/preview/DesktopBrowserHost.ts
#	apps/desktop/src/preview/Manager.ts
#	apps/server/src/preview/DesktopBrowserChannel.ts

```

## Parents

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

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

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