# Merge branch 'main' into guest-promotion · gitcafe/zed

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

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

Visibility: public

Requested revision: 276bfa0fab2b7e2a412b445bd43fdf7aaab8fffc

Requested commit: 276bfa0fab2b7e2a412b445bd43fdf7aaab8fffc

Commit: 276bfa0fab2b7e2a412b445bd43fdf7aaab8fffc

Tree: 1481e9554b430ef84626fc7bd5c25b9678488b6a

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into guest-promotion

```

## Parents

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

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

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