# Merge branch 'main' into settings-for-journal · gitcafe/zed

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

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

Visibility: public

Requested revision: 9a381c18034c3fcd09fa27e71c4f20562aab4ca9

Requested commit: 9a381c18034c3fcd09fa27e71c4f20562aab4ca9

Commit: 9a381c18034c3fcd09fa27e71c4f20562aab4ca9

Tree: 1a2af9a21e70a7a2f9c540069e1b62e729025416

Author: Joseph T Lyons

Committer: Joseph T Lyons

## Message

```
Merge branch 'main' into settings-for-journal

```

## Parents

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

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

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