# Merge remote-tracking branch 'origin/main' into fix/codex-account-reasoning-controls · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 7807ad0e5fe70fee3cfb546cdda195c24d4ac7cd

Requested commit: 7807ad0e5fe70fee3cfb546cdda195c24d4ac7cd

Commit: 7807ad0e5fe70fee3cfb546cdda195c24d4ac7cd

Tree: 0ea711cbe7b5a2bd0f9bb41d2da9f7d30d4fe6f2

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into fix/codex-account-reasoning-controls

# Conflicts:
#	apps/server/src/provider/CodexChatGptModels.ts

```

## Parents

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

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

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