Merge pull request qmk#2 from qmk/master

Catch up with qmk
striveFar · Apr 22, 2021 · 173d2a1 · 173d2a1
2 parents ff8bfb2 + ffa1507
commit 173d2a1
Show file tree

Hide file tree

Showing 1,136 changed files with 41,950 additions and 6,921 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -92,3 +92,4 @@ GRAPHICS
 # hex files
 *.hex binary
 *.eep binary
+nix/sources.nix linguist-generated=true