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

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

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

Visibility: public

Requested revision: b85ef2300fa72f5f4c73b8eb9e14f0218ada592d

Requested commit: b85ef2300fa72f5f4c73b8eb9e14f0218ada592d

Commit: b85ef2300fa72f5f4c73b8eb9e14f0218ada592d

Tree: daee8ab81eaefb5433f6ba3750656ba769a311a4

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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