# Merge branch 'main' into remove-old-theme · gitcafe/zed

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

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

Visibility: public

Requested revision: 1e7e3804f24a8f7a35f1091d314d2cb846dbdfbc

Requested commit: 1e7e3804f24a8f7a35f1091d314d2cb846dbdfbc

Commit: 1e7e3804f24a8f7a35f1091d314d2cb846dbdfbc

Tree: f7185f9bb5656c0ef5ec5bab7b903c8551ad2e6a

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into remove-old-theme

```

## Parents

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

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

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