# Merge remote-tracking branch 'origin/main' into fix/desktop-async-topology-sol61 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: f308eeddb44d6df1aa7ffe9bd0591e8f52b7d132

Requested commit: f308eeddb44d6df1aa7ffe9bd0591e8f52b7d132

Commit: f308eeddb44d6df1aa7ffe9bd0591e8f52b7d132

Tree: 0c7aa5aebebbef73c89a372af28dab7e25344293

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into fix/desktop-async-topology-sol61

# Conflicts:
#	apps/desktop/src/ipc/methods/window.ts
#	apps/web/src/connection/desktopLocal.ts

```

## Parents

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

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

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