Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-04-25 20:46:54 +00:00
commit 61a1915cce

1
.gitignore vendored
View file

@ -51,6 +51,7 @@ doxygen/
.browse.VC.db* .browse.VC.db*
*.stackdump *.stackdump
# Let these ones be user specific, since we have so many different configurations # Let these ones be user specific, since we have so many different configurations
*.code-workspace
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
.vscode/launch.json .vscode/launch.json
.vscode/tasks.json .vscode/tasks.json