# Merge branch 'slim/17585' into slim/17586 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 45ac6adce0c51dd60efa1c366059d6abd13db6ee

Requested commit: 45ac6adce0c51dd60efa1c366059d6abd13db6ee

Commit: 45ac6adce0c51dd60efa1c366059d6abd13db6ee

Tree: c24c92d741ea8a227660e53c0e9e6048473d24bd

Author: maria-rcks

Committer: maria-rcks

## Message

```
Merge branch 'slim/17585' into slim/17586

# Conflicts:
#	apps/server/src/provider/ProviderRegistry.test.ts

```

## Parents

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

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

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