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

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

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

Visibility: public

Requested revision: f8504c349c878f64436e44d1fc52b73ef39302dd

Requested commit: f8504c349c878f64436e44d1fc52b73ef39302dd

Commit: f8504c349c878f64436e44d1fc52b73ef39302dd

Tree: aac61c7958db83568ca84d799595f744b3bd2fe8

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Merge branch 'main' into import-theme

```

## Parents

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

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

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