# Merge remote-tracking branch 'origin/main' into slim/17585 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 17a10c845114bfcf95b9b93de0a9a1435dddb4dd

Requested commit: 17a10c845114bfcf95b9b93de0a9a1435dddb4dd

Commit: 17a10c845114bfcf95b9b93de0a9a1435dddb4dd

Tree: 744076168b276d6c25b265ed17936a331b48c97c

Author: maria-rcks

Committer: maria-rcks

## Message

```
Merge remote-tracking branch 'origin/main' into slim/17585

# Conflicts:
#	apps/server/src/environment/ServerEnvironment.ts
#	apps/server/src/provider/providerMaintenanceRunner.test.ts
#	apps/server/src/provider/providerMaintenanceRunner.ts
#	apps/server/src/serverSettings.ts

```

## Parents

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

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

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