# Merge remote-tracking branch 'origin/main' into assistant-2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 14def2a1a30aedacca2a7efc6eea413bf67a1ee9

Requested commit: 14def2a1a30aedacca2a7efc6eea413bf67a1ee9

Commit: 14def2a1a30aedacca2a7efc6eea413bf67a1ee9

Tree: c2a0adcf2125a96145f70e655a7a8ae750affc0c

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into assistant-2

# Conflicts:
#	crates/ui2/src/components/icon.rs

```

## Parents

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

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

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