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

@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (assigned to the top left key) and plug in the keyboard while holding it.
* **Physical reset button**: Press and hold the boot0 button on the blackpill, tap and release the nrst button on the blackpill, then release the boot0 button.
* **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.