# Merge pull request \#22522 from squeek502/resinator-sync · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/160445ef316f76dfddfa17b11c4919a3e14f486d)

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

Visibility: public

Requested revision: 160445ef316f76dfddfa17b11c4919a3e14f486d

Requested commit: 160445ef316f76dfddfa17b11c4919a3e14f486d

Commit: 160445ef316f76dfddfa17b11c4919a3e14f486d

Tree: 55f13daf40012512ac591a0350d9b91643fbdaf1

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #22522 from squeek502/resinator-sync

resinator: Sync with upstream
```

## Parents

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

- [289e9c3507d622bd42a6dee4df8a69dd71a7dfe6](https://git.cafe/gitcafe/zig/commit/289e9c3507d622bd42a6dee4df8a69dd71a7dfe6?format=markdown)

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