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

[BACKPORT] 4982 to 1.0.latest #4996

Closed
wants to merge 2 commits into from
Closed

[BACKPORT] 4982 to 1.0.latest #4996

wants to merge 2 commits into from

Commits on Apr 5, 2022

  1. resolve merge conflicts

    @emmyoop
    emmyoop committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    06c2290 View commit details
    Browse the repository at this point in the history

  2. clean up missed conflict issue

    @emmyoop
    emmyoop committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    579e4bf View commit details
    Browse the repository at this point in the history