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

fix: don't append Shift modifier text twice to accelerators #698

Merged
merged 2 commits into from Oct 26, 2018

Conversation

Projects
None yet
2 participants
@brenca
Member

brenca commented Oct 25, 2018

Backport of electron/electron#15400 to 3-0-x

@brenca brenca requested review from nornagon and zcbenz Oct 25, 2018

@ckerr

ckerr approved these changes Oct 26, 2018

@ckerr ckerr merged commit bddc0bf into electron-3-0-x Oct 26, 2018

19 checks passed

Semantic Pull Request ready to be squashed
Details
WIP ready for review
Details
appveyor: libchromiumcontent-ia32-shared AppVeyor build succeeded
Details
appveyor: libchromiumcontent-ia32-static AppVeyor build succeeded
Details
appveyor: libchromiumcontent-x64-shared AppVeyor build succeeded
Details
appveyor: libchromiumcontent-x64-static AppVeyor build succeeded
Details
ci/circleci: libchromiumcontent-linux-arm-shared Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-arm-static Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-arm64-shared Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-arm64-static Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-ia32-shared Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-ia32-static Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-x64-shared Your tests passed on CircleCI!
Details
ci/circleci: libchromiumcontent-linux-x64-static Your tests passed on CircleCI!
Details
libchromiumcontent-mas-shared-branch #20181026.1 succeeded
Details
libchromiumcontent-mas-static-branch #20181026.1 succeeded
Details
libchromiumcontent-mas-static-pr #20181026.1 succeeded
Details
libchromiumcontent-osx-shared-branch #20181026.1 succeeded
Details
libchromiumcontent-osx-static-branch #20181026.1 succeeded
Details

@ckerr ckerr deleted the brenca/fix-shift-accelerators branch Oct 26, 2018

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