aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-26 19:18:51 +0000
committerQMK Bot <hello@qmk.fm>2021-04-26 19:18:51 +0000
commita8c0954db5b0c39413c49b17c30a626e69373d3e (patch)
tree908773f9673be2fe1c05dc462694723446a01d9f
parent171f3e840b0cb990d71ad034d906b3044c77ce29 (diff)
parentb5419bd574600565bf4b2479bf07c7cc39dbfeea (diff)
downloadqmk_firmware-a8c0954db5b0c39413c49b17c30a626e69373d3e.tar.gz
qmk_firmware-a8c0954db5b0c39413c49b17c30a626e69373d3e.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3592abcea..adc5d9da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ id_rsa_*
73 73
74# python things 74# python things
75__pycache__ 75__pycache__
76.python-version
76 77
77# prerequisites for updating ChibiOS 78# prerequisites for updating ChibiOS
78/util/fmpp* 79/util/fmpp*