# Merge branch 'main' into kvark-linux · gitcafe/zed

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

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

Visibility: public

Requested revision: 67555ee5b47d652e19939f26c50e667a20199c57

Requested commit: 67555ee5b47d652e19939f26c50e667a20199c57

Commit: 67555ee5b47d652e19939f26c50e667a20199c57

Tree: ec23cb1e767fb445147b0a5f9f7fcc1b18a0c4cf

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into kvark-linux

```

## Parents

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

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

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