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

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

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

Visibility: public

Requested revision: b6bb0ee1acd6fb9e3360f35d7b63687f755785f6

Requested commit: b6bb0ee1acd6fb9e3360f35d7b63687f755785f6

Commit: b6bb0ee1acd6fb9e3360f35d7b63687f755785f6

Tree: 34f42b24cc683d13a9e78bd27f914dfee00c37b0

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

Conflicts:
 * lib/std/os/linux/tls.zig
 * test/behavior/align.zig
 * test/behavior/atomics.zig
 * test/behavior/vector.zig

```

## Parents

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

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

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