# Merge branch 'master' into docs-local · gitcafe/zig

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

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

Visibility: public

Requested revision: 352663a34c885eb9b944929ac076806ce2f0d416

Requested commit: 352663a34c885eb9b944929ac076806ce2f0d416

Commit: 352663a34c885eb9b944929ac076806ce2f0d416

Tree: cb4e7c48d6ac2191d23842b3d97ffd6f82c05243

Author: Rocknest

Committer: GitHub

## Message

```
Merge branch 'master' into docs-local
```

## Parents

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

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

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