# Merge branch 'main' into event-emitter · gitcafe/zed

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

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

Visibility: public

Requested revision: 2c67cc80ba8f6681325f41ef5df1c63536ad4b7d

Requested commit: 2c67cc80ba8f6681325f41ef5df1c63536ad4b7d

Commit: 2c67cc80ba8f6681325f41ef5df1c63536ad4b7d

Tree: 30a2b3cbcbb8fac6daa0b06ba2c4c6a3f304bb6b

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into event-emitter

```

## Parents

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

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

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