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

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

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

Visibility: public

Requested revision: a7edd380e3743a37a498e31a9684c51eb3bb6c2d

Requested commit: a7edd380e3743a37a498e31a9684c51eb3bb6c2d

Commit: a7edd380e3743a37a498e31a9684c51eb3bb6c2d

Tree: ab8f03a398cff1d938ca69b30c8669036d16dbec

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

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

```

## Parents

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

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

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