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

This commit is contained in:
Drashna Jael're
2021-12-08 08:17:55 -08:00
152 changed files with 516 additions and 667 deletions

View File

@@ -5,8 +5,7 @@ MCU = atmega32u4
BOOTLOADER = caterina
# Build Options
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys