# Merge remote-tracking branch 'origin/main' into zed2-workspace · gitcafe/zed

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

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

Visibility: public

Requested revision: 269a72464d56cee19fb17bee045ced54bd46cf01

Requested commit: 269a72464d56cee19fb17bee045ced54bd46cf01

Commit: 269a72464d56cee19fb17bee045ced54bd46cf01

Tree: 2fc1995a4cda31f75a5305a1dcc5fcd552fce1a0

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge remote-tracking branch 'origin/main' into zed2-workspace

```

## Parents

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

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

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