# Merge branch 'AdamGoertz-master' · gitcafe/zig

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

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

Visibility: public

Requested revision: 1295525a7afe76d0ac384b3f74927ac22b27ec09

Requested commit: 1295525a7afe76d0ac384b3f74927ac22b27ec09

Commit: 1295525a7afe76d0ac384b3f74927ac22b27ec09

Tree: 3609306627c17f83745046cccbde57760088eb4d

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'AdamGoertz-master'

closes #5080
closes #6887

```

## Parents

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

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

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