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

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

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

Visibility: public

Requested revision: c2ed45ae01386d9e53a1362e6bd7e52443936b83

Requested commit: c2ed45ae01386d9e53a1362e6bd7e52443936b83

Commit: c2ed45ae01386d9e53a1362e6bd7e52443936b83

Tree: 2037c66529f1bb5000ad6843351e424f831377b1

Author: maria-rcks

Committer: maria-rcks

## Message

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

# Conflicts:
#	apps/server/src/cli/update.test.ts
#	apps/server/src/cloud/selfUpdate.test.ts
#	apps/server/src/cloud/servicePreflight.test.ts
#	apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
#	apps/server/src/pullRequest/PullRequestReviewGuideService.test.ts
#	apps/server/src/serviceLauncher.test.ts
#	apps/server/src/serviceLauncher.ts
#	apps/server/src/terminal/Manager.test.ts
#	packages/shared/src/cliRelease.test.ts

```

## Parents

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

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

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