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

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

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

Visibility: public

Requested revision: 80b7f75d24c1551967dc3579c81bd6a0fe36e800

Requested commit: 80b7f75d24c1551967dc3579c81bd6a0fe36e800

Commit: 80b7f75d24c1551967dc3579c81bd6a0fe36e800

Tree: f0f5c2fb4e8a9e40e56af170596b450462b391ff

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into file_finder

```

## Parents

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

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

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