# Merge branch 'main' into nate/bring-ui-crate-up-to-date · gitcafe/zed

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

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

Visibility: public

Requested revision: d14e4d41ea94953f473a70fb8cca3fbb8543191d

Requested commit: d14e4d41ea94953f473a70fb8cca3fbb8543191d

Commit: d14e4d41ea94953f473a70fb8cca3fbb8543191d

Tree: 458b1441b0104e91a423ff36dd16ed7e2b3b8a6e

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into nate/bring-ui-crate-up-to-date

```

## Parents

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

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

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