# Merge remote-tracking branch 'origin/main' into fix/18928-auto-settle-limit-recovery · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 8af66c3aaeb6dde5b1d488c70524372362e4d978

Requested commit: 8af66c3aaeb6dde5b1d488c70524372362e4d978

Commit: 8af66c3aaeb6dde5b1d488c70524372362e4d978

Tree: 78f15264335b9ac5b93c4c152fb959f8926fcc04

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into fix/18928-auto-settle-limit-recovery

# Conflicts:
#	apps/server/src/orchestration-v2/Orchestrator.control-reads.test.ts
#	apps/server/src/orchestration-v2/ThreadSettlementService.ts

```

## Parents

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

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

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