# Merge remote-tracking branch 'origin/main' into t3/background-provider-updates-int · pingdotgg/t3code

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

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

Visibility: public

Requested revision: d389a5df0dea542f1e8e977b17f7280f12d667cb

Requested commit: d389a5df0dea542f1e8e977b17f7280f12d667cb

Commit: d389a5df0dea542f1e8e977b17f7280f12d667cb

Tree: 4f1e30c825c09584dd513e1396258e887289564f

Author: maria-rcks

Committer: maria-rcks

## Message

```
Merge remote-tracking branch 'origin/main' into t3/background-provider-updates-int

# Conflicts:
#	apps/server/src/provider/CodexProvider.ts

```

## Parents

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

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

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