# Merge remote-tracking branch 'origin/main' into agent/web-appearance-fonts · stienswout/t3code

[View on GitCafe](https://git.cafe/stienswout/t3code/commit/a0ac88f62c1ce75427eb788e7833f24db3d23978)

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

Visibility: public

Requested revision: a0ac88f62c1ce75427eb788e7833f24db3d23978

Requested commit: a0ac88f62c1ce75427eb788e7833f24db3d23978

Commit: a0ac88f62c1ce75427eb788e7833f24db3d23978

Tree: 05580d83efc44d3b03c9ddb2127980ebf3399f88

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into agent/web-appearance-fonts

# Conflicts:
#	apps/web/src/components/BranchToolbar.tsx

```

## Parents

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

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

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