# Merge branch 'main' into nate/add-bash-highlighting · gitcafe/zed

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

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

Visibility: public

Requested revision: fab26267db10904560add6527e0c5e23b17685d6

Requested commit: fab26267db10904560add6527e0c5e23b17685d6

Commit: fab26267db10904560add6527e0c5e23b17685d6

Tree: f4717972228661ba38af24ba5679d474e5d61d1b

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'main' into nate/add-bash-highlighting

```

## Parents

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

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

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