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

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

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

Visibility: public

Requested revision: 2344c7786ee1449abf4b53136318eb0d89959d2f

Requested commit: 2344c7786ee1449abf4b53136318eb0d89959d2f

Commit: 2344c7786ee1449abf4b53136318eb0d89959d2f

Tree: 300df428216de19608421597d1a73398cfd86fab

Author: Julius Marminge

Committer: Julius Marminge

## Message

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

# Conflicts:
#	apps/server/src/bootstrap.test.ts

```

## Parents

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

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

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