# Merge remote-tracking branch 'origin/main' into cancel-clicks-on-drag · gitcafe/zed

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

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

Visibility: public

Requested revision: 87ae21feb38d7f4bbca44e92c3b372e03d4f25a2

Requested commit: 87ae21feb38d7f4bbca44e92c3b372e03d4f25a2

Commit: 87ae21feb38d7f4bbca44e92c3b372e03d4f25a2

Tree: 7050d302823ab2b822c818d273ced427bfb81cbe

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into cancel-clicks-on-drag

```

## Parents

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

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

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