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

This commit is contained in:
QMK Bot 2021-10-26 04:15:18 +00:00
commit cf1749323c
31 changed files with 4 additions and 35 deletions

View file

@ -61,7 +61,6 @@ OTHER_OPTION_NAMES = \
HAPTIC_ENABLE \
HHKB_RN42_ENABLE \
ISSI_ENABLE \
KEYBOARD_LOCK_ENABLE \
KEYLOGGER_ENABLE \
LCD_BACKLIGHT_ENABLE \
MACROS_ENABLED \