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

Merge recent changes on master to dev branch to resolve merge conflicts #11604

Merged
merged 1 commit into from
Nov 10, 2020
Merged

Merge recent changes on master to dev branch to resolve merge conflicts #11604

merged 1 commit into from
Nov 10, 2020

Commits on Nov 10, 2020

  1. resovle merge conlicts to master, adding recent master change to dev … 

    …branch
    Xiahe Liu authored and Xiahe Liu committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    a7a5032 View commit details
    Browse the repository at this point in the history