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

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

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

Visibility: public

Requested revision: 158e2312ea5f680b7c8598ef578aefb6cbdd3372

Requested commit: 158e2312ea5f680b7c8598ef578aefb6cbdd3372

Commit: 158e2312ea5f680b7c8598ef578aefb6cbdd3372

Tree: c5ab42fd98dff7c2bf9be090a61b1e0dd639bbc8

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'JohnathanFL-master'

closes #2900
closes #2894

```

## Parents

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

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

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