Skip to content

Conversation

@addaleax
Copy link
Member

Fixes: #14523
Backport of: #14527

The conflicts were only in zlib.js.

Fixes: nodejs#14523 PR-URL: nodejs#14527 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
@nodejs-github-botnodejs-github-bot added v8.x zlib Issues and PRs related to the zlib subsystem. labels Aug 1, 2017
@addaleax
Copy link
MemberAuthor

addaleax added a commit that referenced this pull request Aug 2, 2017
Backport-PR-URL: #14571 Backport-Reviewed-By: James M Snell <[email protected]> Fixes: #14523 PR-URL: #14527 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
@addaleax
Copy link
MemberAuthor

Landed in e529914

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

zlibIssues and PRs related to the zlib subsystem.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@addaleax@jasnell@nodejs-github-bot