drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
Drashna Jael're 2022-08-20 10:22:48 -07:00
commit 8f6b019dcc
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
353 changed files with 374 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/merge/um80/readme.md
View file

@ -19,4 +19,4 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the Esc key on the left side or '7' key on the right side and plug in the keyboard.
* **Physical reset button**: Briefly press the button on the back of the PCB.
* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.