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

This commit is contained in:
Drashna Jael're 2022-08-20 10:22:48 -07:00
commit 8f6b019dcc
No known key found for this signature in database
GPG key ID: DBA1FD3A860D1B11
353 changed files with 374 additions and 374 deletions

View file

@ -23,7 +23,7 @@ Some BIOSs may not detect keypresses properly while NRKO is enabled according to
Enter the bootloader in 2 ways (all keys assume default layout):
* **Keycode in layout**: Hold Fn key and press the Windows(GUI) key (mapped to `RESET`)
* **Keycode in layout**: Hold Fn key and press the Windows(GUI) key (mapped to `QK_BOOT`)
* **Physical reset button**: Briefly press the button on the back of the PCB (labeled sw1)
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).