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

This commit is contained in:
Drashna Jael're
2022-08-20 10:22:48 -07:00
353 changed files with 374 additions and 374 deletions

View File

@@ -41,5 +41,5 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the top left key on the left half (or the top right right key on the right half) and plug in the controller on that side.
* **Physical reset pins**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
* **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.