# Merge remote-tracking branch 'origin/rich_text2' into editor2 · gitcafe/zed

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

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

Visibility: public

Requested revision: 2a12e8f3076d836594cc9c48f1a8705613f72180

Requested commit: 2a12e8f3076d836594cc9c48f1a8705613f72180

Commit: 2a12e8f3076d836594cc9c48f1a8705613f72180

Tree: 7dd35632212b7fff054848a4307a75e82d712413

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/rich_text2' into editor2

```

## Parents

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

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

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