# Merge branch 'main' into terminal-element · gitcafe/zed

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

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

Visibility: public

Requested revision: fd31e429f5f0636cf3136f3eaaa8020e6c9ae48f

Requested commit: fd31e429f5f0636cf3136f3eaaa8020e6c9ae48f

Commit: fd31e429f5f0636cf3136f3eaaa8020e6c9ae48f

Tree: 27e6ac38b94d77d3a72b6cdefcced5f5e081a908

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into terminal-element

```

## Parents

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

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

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