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

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

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

Visibility: public

Requested revision: 12500364b49884e1ed88d9868a623339aa2a24b0

Requested commit: 12500364b49884e1ed88d9868a623339aa2a24b0

Commit: 12500364b49884e1ed88d9868a623339aa2a24b0

Tree: 0a99dc2c243c1e853eb092905f3bd9bcd9c5b706

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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