# Merge GitHub main into git.cafe main · screen/aggregate-mail

[View on GitCafe](https://git.cafe/screen/aggregate-mail/commit/0eab12ef1c568c1ebfb02dfcb222899ecc096392)

Repository: [screen/aggregate-mail](https://git.cafe/screen/aggregate-mail)

Visibility: public

Requested revision: 0eab12ef1c568c1ebfb02dfcb222899ecc096392

Requested commit: 0eab12ef1c568c1ebfb02dfcb222899ecc096392

Commit: 0eab12ef1c568c1ebfb02dfcb222899ecc096392

Tree: 4174fdcc22f257a492de8df995b9da8ac7463708

Author: Screen

Committer: Screen

## Message

```
Merge GitHub main into git.cafe main

git.cafe's main was missing the Emc² rename (3fc4d30, merged on GitHub as
5df470a) and the mail-links merge (PR #4). Both are now in the history, and
the emc2 rename is carried into this host rather than living on GitHub alone.

Conflicts in package.json, CONTRIBUTING.md and docs/KB.md were wording and
glob-order only; the rename side was kept and the test globs unified.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>

```

## Parents

- [b43db2ee6722891b804ca9859856c148553659a8](https://git.cafe/screen/aggregate-mail/commit/b43db2ee6722891b804ca9859856c148553659a8?format=markdown)

- [5df470ac7ccfe3cb2417f4a12349418bfdb1de2d](https://git.cafe/screen/aggregate-mail/commit/5df470ac7ccfe3cb2417f4a12349418bfdb1de2d?format=markdown)

[Source at this commit](https://git.cafe/screen/aggregate-mail/tree/0eab12ef1c568c1ebfb02dfcb222899ecc096392?format=markdown)