Merge remote-tracking branch 'origin/master' into develop
Move GMMK Pro layouts to the correct subdir (#14241) Also fix a compilation issue in the mike1808 keymap
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Disable console on Iris Rev5 (#14249)
Merge remote-tracking branch 'origin/master' into develop
emi20: remove dead space from Configurator layout (#14254)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add FJLabs KF87 PCB (#14179) Co-authored-by: Drashna Jaelre <drashna@live.com>
Merge remote-tracking branch 'origin/master' into develop
[Keymap] reflects current rick's keymap (#14169)
handwired/symmetric70_proto use post_rules.mk (#14235)
[Keyboard] Helix use `post_rules.mk` (#14216) * Helix/pico use post_rules.mk insted of local_features.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 ``` * Helix/rev2 use post_rules.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 ```
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225) Co-authored-by: Joel Challis <git@zvecr.com>
Merge remote-tracking branch 'origin/master' into develop
cherry pick tidy up (#14244)
Merge remote-tracking branch 'origin/master' into develop
Documentation: Fix links in key overrides (#14228) Co-authored-by: Joel Challis <git@zvecr.com>
Merge remote-tracking branch 'origin/master' into develop
Update ws2812_spi.c (#14237)