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.

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

Fixes an error in generated_resources_de.xtb (1.18.x). #7235

Merged
merged 1 commit into from
Nov 25, 2020

Conversation

mkarolin
Copy link
Collaborator

Fixes brave/brave-browser#12844
Uplift from #7232

Skipping CI since the change is only in the string value.

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Fixes an error in generated_resources_de.xtb.
@mkarolin mkarolin added the CI/skip Do not run CI builds (except noplatform) label Nov 24, 2020
@mkarolin mkarolin requested a review from a team November 24, 2020 13:37
@mkarolin mkarolin self-assigned this Nov 24, 2020
@kjozwiak kjozwiak added this to the 1.18.x - Beta milestone Nov 25, 2020
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.18.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7232 (comment).

@kjozwiak kjozwiak merged commit e078216 into 1.18.x Nov 25, 2020
@mihaiplesa mihaiplesa deleted the maxk-fix-12844-1.18.x branch November 25, 2020 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip Do not run CI builds (except noplatform)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants