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

@ -30,7 +30,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
Enter the bootloader in 3 ways:
* **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
* **Physical reset button**: Briefly press the reset button soldered on the PCB.
* **Bootmagic reset**: Hold down the top left key on the left half (or the top right key on the right half) and plug in the controller on that side.