# Merge remote-tracking branch 'origin/main' into chat-font-size · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/29ac1fd081414842fcfe14027c9662dec81ca515)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 29ac1fd081414842fcfe14027c9662dec81ca515

Requested commit: 29ac1fd081414842fcfe14027c9662dec81ca515

Commit: 29ac1fd081414842fcfe14027c9662dec81ca515

Tree: 16f182ec8bea7118491a51f98cab4580982f95d6

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge remote-tracking branch 'origin/main' into chat-font-size

```

## Parents

- [6e1f44163ef1b4fa1deea2ea694005b6d0b66fd7](https://git.cafe/gitcafe/zed/commit/6e1f44163ef1b4fa1deea2ea694005b6d0b66fd7?format=markdown)

- [0858db9ebb16d5c4991f96e69fab99037cd6fc4e](https://git.cafe/gitcafe/zed/commit/0858db9ebb16d5c4991f96e69fab99037cd6fc4e?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/29ac1fd081414842fcfe14027c9662dec81ca515?format=markdown)