1
0
Fork 0

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
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
353 changed files with 374 additions and 374 deletions

View file

@ -18,4 +18,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
* **Physical reset button**: Briefly short the pads labeled "Reset" on 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

View file

@ -26,4 +26,4 @@ Enter the bootloader in 2 ways:
* **Physical reset button**: Power up the board while having the `Reset/Boot0` pad shorted.
* **Keycode in layout**: Press the `GRV` key on layer 1 which is mapped to `RESET`
* **Keycode in layout**: Press the `GRV` key on layer 1 which is mapped to `QK_BOOT`