# Merge branch 'main' into migrations-on-server-start · gitcafe/zed

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

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

Visibility: public

Requested revision: bebb528656e0b39cc3e8422c4096427956a903d7

Requested commit: bebb528656e0b39cc3e8422c4096427956a903d7

Commit: bebb528656e0b39cc3e8422c4096427956a903d7

Tree: 24b1a5a9246fcee4d15d3765a968629877886852

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into migrations-on-server-start

```

## Parents

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

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

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