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

miryoku-merge-master
QMK Bot 4 years ago
commit f0a2641cf1

@ -2,7 +2,7 @@
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable

Loading…
Cancel
Save