forked from espressif/esp-idf
Merge branch 'bugfix/github_diverged' into 'master'
fix Github master branch diverged from Gitlab master branch See merge request espressif/esp-idf!22550
This commit is contained in:
fix Github master branch diverged from Gitlab master branch See merge request espressif/esp-idf!22550