Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: cherry-pick 4c57222340cf from chromium #23009

Merged
merged 6 commits into from Apr 9, 2020
Merged

chore: cherry-pick 4c57222340cf from chromium #23009

merged 6 commits into from Apr 9, 2020

Commits on Apr 8, 2020

  1. chore: cherry-pick 4c57222340cf from chromium

    @nornagon
    nornagon committed Apr 8, 2020
    Copy the full SHA
    0bd1d98 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. resolve conflicts

    @nornagon
    nornagon committed Apr 9, 2020
    Copy the full SHA
    508f929 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/7-2-x' into cherry-pick/7-2-x/ch… 

    …romium/4c57222340cf
    @nornagon
    nornagon committed Apr 9, 2020
    Copy the full SHA
    2026d60 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/7-2-x' into cherry-pick/7-2-x/ch… 

    …romium/4c57222340cf
    @nornagon
    nornagon committed Apr 9, 2020
    Copy the full SHA
    1bc6259 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/7-2-x' into cherry-pick/7-2-x/ch… 

    …romium/4c57222340cf
    @nornagon
    nornagon committed Apr 9, 2020
    Copy the full SHA
    bec33f8 View commit details
    Browse the repository at this point in the history

  5. fix patch

    @nornagon
    nornagon committed Apr 9, 2020
    Copy the full SHA
    3917e83 View commit details
    Browse the repository at this point in the history