# Merge remote-tracking branch 'origin/master' into llvm12 · gitcafe/zig

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

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

Visibility: public

Requested revision: 584cb2e4fb67eb95a8c9d790f807235c8088bd76

Requested commit: 584cb2e4fb67eb95a8c9d790f807235c8088bd76

Commit: 584cb2e4fb67eb95a8c9d790f807235c8088bd76

Tree: 26e1a211055647edf04734ce0d10ff5f762df31c

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm12

```

## Parents

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

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

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