# Merge branch 'main' into collab_ui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 8c14a8fa95618997ab77c02204f9e2fbcd22b974

Requested commit: 8c14a8fa95618997ab77c02204f9e2fbcd22b974

Commit: 8c14a8fa95618997ab77c02204f9e2fbcd22b974

Tree: c01ae542e31ccddba56a81f4aba288983c586ee2

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into collab_ui2

```

## Parents

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

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

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