# Merge remote-tracking branch 'origin/main' into fix/issue-20339 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: eec261fc23cfd8ac923e793995091b66f876556e

Requested commit: eec261fc23cfd8ac923e793995091b66f876556e

Commit: eec261fc23cfd8ac923e793995091b66f876556e

Tree: 1ee0a25cc19bc388e5889e6a6b91b5888a97d510

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into fix/issue-20339

# Conflicts:
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts

```

## Parents

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

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

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