# Merge pull request \#1261 from zed-industries/combined-activity-indicator · gitcafe/zed

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

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

Visibility: public

Requested revision: 15b7e2ed320e9c4c0820abcfada59272e2319416

Requested commit: 15b7e2ed320e9c4c0820abcfada59272e2319416

Commit: 15b7e2ed320e9c4c0820abcfada59272e2319416

Tree: 8ac78ec5899a4c64036f179d30ca43e56d47a233

Author: Max Brunsfeld

Committer: GitHub

## Message

```
Merge pull request #1261 from zed-industries/combined-activity-indicator

Show LSP status and auto update status in one status bar indicator
```

## Parents

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

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

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