# Merge branch 't3/background-provider-updates-int' into t3/background-server-updates · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 1990a521e95cde909d678815f980e4e88aa6054b

Requested commit: 1990a521e95cde909d678815f980e4e88aa6054b

Commit: 1990a521e95cde909d678815f980e4e88aa6054b

Tree: d103e3acfb2709055aae4cacff69598446efddca

Author: maria-rcks

Committer: maria-rcks

## Message

```
Merge branch 't3/background-provider-updates-int' into t3/background-server-updates

# Conflicts:
#	apps/server/src/http.ts

```

## Parents

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

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

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