# Merge branch 'main' into update-assistant-styles · gitcafe/zed

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

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

Visibility: public

Requested revision: 4029481fd012e4ff019dfda74e974c75eedde9ea

Requested commit: 4029481fd012e4ff019dfda74e974c75eedde9ea

Commit: 4029481fd012e4ff019dfda74e974c75eedde9ea

Tree: f405d40d7b9c92d84522fc60d515a302491daa7f

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into update-assistant-styles

```

## Parents

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

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

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