# Merge branch 'n/gpui2ui-settings' into gpui2 · gitcafe/zed

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

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

Visibility: public

Requested revision: a6a50113dab7155dfcf5f334c47ad219a48d90ba

Requested commit: a6a50113dab7155dfcf5f334c47ad219a48d90ba

Commit: a6a50113dab7155dfcf5f334c47ad219a48d90ba

Tree: f6a64e29f6601ed66fd7e23d2ec558d1db66666d

Author: Nate Butler

Committer: Nate Butler

## Message

```
Merge branch 'n/gpui2ui-settings' into gpui2

```

## Parents

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

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

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