# Merge branch 'main' into chat-mentions-for-newly-joined-users · gitcafe/zed

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

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

Visibility: public

Requested revision: 9693e1480945ca69d63e31ad5b0b26246bb1cf53

Requested commit: 9693e1480945ca69d63e31ad5b0b26246bb1cf53

Commit: 9693e1480945ca69d63e31ad5b0b26246bb1cf53

Tree: a189ac2564d7a904478a84f4e10a7005bbee4982

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into chat-mentions-for-newly-joined-users

```

## Parents

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

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

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