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

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

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

Visibility: public

Requested revision: 1f34c03ac14ac352ec03267ca8592dadfbd5e4bc

Requested commit: 1f34c03ac14ac352ec03267ca8592dadfbd5e4bc

Commit: 1f34c03ac14ac352ec03267ca8592dadfbd5e4bc

Tree: ebcb851922636b7dd2b17acb72187836c86180ec

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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