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

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

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

Visibility: public

Requested revision: 108ae35b9d5638620ec36af1993b162d262c356b

Requested commit: 108ae35b9d5638620ec36af1993b162d262c356b

Commit: 108ae35b9d5638620ec36af1993b162d262c356b

Tree: 436a913c1bba4a97e84ae93041d23ab9aac55ac9

Author: Julius Marminge

Committer: Julius Marminge

## Message

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

# Conflicts:
#	packages/provider-core/src/server/failure.ts

```

## Parents

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

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

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