# Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen · gitcafe/zig

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

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

Visibility: public

Requested revision: ae04ec776d87eb6312b9172fc494f1ab25c1c52e

Requested commit: ae04ec776d87eb6312b9172fc494f1ab25c1c52e

Commit: ae04ec776d87eb6312b9172fc494f1ab25c1c52e

Tree: 1477fdec01060afbba919424d3d11cf327f0a9a6

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

Need that _main -> main improvement

```

## Parents

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

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

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