New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mismerge fixes for 56.0 #284

Merged
merged 3 commits into from Nov 30, 2017

Conversation

3 participants
@jbeich
Contributor

jbeich commented Nov 27, 2017

git diff FIREFOX_56_0_2_RELEASE..waterfox/master currently shows a lot of whitespace noise. Most of that is caused by recent 56.0 merge and will get in the way of backporting fixes from Firefox 57+.

@MrAlex94 MrAlex94 merged commit ee31b5e into MrAlex94:master Nov 30, 2017

@MrAlex94

This comment has been minimized.

Show comment
Hide comment
@MrAlex94

MrAlex94 Nov 30, 2017

Owner

Thanks, merged.

Owner

MrAlex94 commented Nov 30, 2017

Thanks, merged.

@grahamperrin

This comment has been minimized.

Show comment
Hide comment
@grahamperrin

grahamperrin Mar 4, 2018

Contributor

@ilikenwf your (duplicate) #292 can probably be closed now. Thanks.

Contributor

grahamperrin commented on 0d91645 Mar 4, 2018

@ilikenwf your (duplicate) #292 can probably be closed now. Thanks.

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