# Merge branch 'main' into managed-view-adjustment · gitcafe/zed

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

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

Visibility: public

Requested revision: 149b9d1aa630d7a5b4402d25776c101a721ac50d

Requested commit: 149b9d1aa630d7a5b4402d25776c101a721ac50d

Commit: 149b9d1aa630d7a5b4402d25776c101a721ac50d

Tree: 602fafb5886cc64332dfe003b7435407b39c7cc4

Author: Mikayla

Committer: Mikayla

## Message

```
Merge branch 'main' into managed-view-adjustment

```

## Parents

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

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

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