# Merge branch 'lun-4-resolve-ip6' · gitcafe/zig

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

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

Visibility: public

Requested revision: 14d235dd6e79dba8d34e05f1912a1bcf9a3ef68c

Requested commit: 14d235dd6e79dba8d34e05f1912a1bcf9a3ef68c

Commit: 14d235dd6e79dba8d34e05f1912a1bcf9a3ef68c

Tree: 9122d4a2eab8b9deef81e089cecee0e7699a08fa

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'lun-4-resolve-ip6'

closes #4864

```

## Parents

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

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

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