# Merge remote-tracking branch 'ziglang/master' into fmt_indentation · gitcafe/zig

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

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

Visibility: public

Requested revision: 671b3abe5d6661a8bca452a0a16dea7ae3d0e516

Requested commit: 671b3abe5d6661a8bca452a0a16dea7ae3d0e516

Commit: 671b3abe5d6661a8bca452a0a16dea7ae3d0e516

Tree: 5e352583b7067d08c4ed34c6ae9d2e2436ec4ec0

Author: Lachlan Easton

Committer: Lachlan Easton

## Message

```
Merge remote-tracking branch 'ziglang/master' into fmt_indentation

```

## Parents

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

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

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