# Merge remote-tracking branch 'origin/main' into t3/win-16826-backend-ownership · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 094191182c9a2270d565ea1837fbd0d393a22caf

Requested commit: 094191182c9a2270d565ea1837fbd0d393a22caf

Commit: 094191182c9a2270d565ea1837fbd0d393a22caf

Tree: 938897898be738585aafea847915906e12922fd5

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Merge remote-tracking branch 'origin/main' into t3/win-16826-backend-ownership

# Conflicts:
#	apps/desktop/src/app/DesktopAppErrors.test.ts
#	apps/desktop/src/backend/DesktopBackendManager.test.ts
#	apps/desktop/src/backend/DesktopBackendManager.ts
#	apps/desktop/src/backend/DesktopBackendPool.test.ts
#	apps/desktop/src/ipc/methods/window.test.ts
#	apps/server/src/cli/config.test.ts
#	apps/server/src/cli/config.ts
#	apps/web/src/connection/platform.test.ts

```

## Parents

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

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

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