# Merge branch 'main' into gpui-events · gitcafe/zed

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

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

Visibility: public

Requested revision: 5ef5147780344a323c5fd2dfb17714dcb3bede4f

Requested commit: 5ef5147780344a323c5fd2dfb17714dcb3bede4f

Commit: 5ef5147780344a323c5fd2dfb17714dcb3bede4f

Tree: 311b9c2ddc5489c28ed64aad0c052553ba5aea1b

Author: Mikayla Maki

Committer: GitHub

## Message

```
Merge branch 'main' into gpui-events
```

## Parents

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

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

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