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

master
QMK Bot 2022-07-16 18:39:27 +00:00
commit 9fa14655df
1 changed files with 4 additions and 0 deletions

4
.gitignore vendored
View File

@ -5,6 +5,10 @@
.DS_Store
._*
# Merge files
*.orig
*.rej
# Build artifacts
.clang_complete
.build/