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

@@ -25,6 +25,6 @@ Flashing example for this keyboard:
To reset the board into bootloader mode, do one of the following:
* **Bootmagic reset**: Hold the `Esc` key while connecting the USB cable (also erases persistent settings)
* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Backspace` by default)
* **Keycode in keymap**: Press the key mapped to `QK_BOOT` if it is available (`Fn`+`Backspace` by default)
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).