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

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

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

Visibility: public

Requested revision: de5c0c9f4092a9d5914013e3428af2252da0be81

Requested commit: de5c0c9f4092a9d5914013e3428af2252da0be81

Commit: de5c0c9f4092a9d5914013e3428af2252da0be81

Tree: 601e35d18140e4a83ca2550b9aeaa7e1415d48e7

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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