Merge remote-tracking branch 'origin/master' into develop
[Core] Add `is_oled_scrolling` (#14305)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Fix rotary encoder function for Voice65 (#14316) Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Fix Space Cadet md link (#14300)
Merge remote-tracking branch 'origin/master' into develop
Enable extra keys for Technik ortho and stagger (#14282) * Extra keys for technik ortho * Extra keys for technik staggered Co-authored-by: filterpaper <filterpaper@localhost>
Merge remote-tracking branch 'origin/master' into develop
FJLabs Ready100 Configurator Fixes (#14291) * grid-align keycodes; use short-form keycodes No logic change. * info.json: correct layout macro reference * info.json: correct LAYOUT_64key data Removes an extra key from the layout data. * 64_ansi Community Layout support * rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility) * add LAYOUTS = 64_ansi to rules.mk * remove width and height keys from info.json
Merge remote-tracking branch 'origin/master' into develop
Naiping NPhhkb: 60_tsangan_hhkb Community Layout support (#14292) * 60_tsangan_hhkb Community Layout support * rename LAYOUT to LAYOUT_60_tsangan_hhkb * add LAYOUTS = 60_tsangan_hhkb to rules.mk * correct maintainer field in info.json * remove width and height keys from info.json * fix GitHub account link on readme
Merge remote-tracking branch 'origin/master' into develop
takashicompany/endzone34: correct QMK Configurator key sequence (#14290) * update info.json formatting * convert tabs to spaces * apply human-friendly formatting * correct Configurator key sequence * remove width and height keys from info.json
Merge remote-tracking branch 'origin/master' into develop
OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293) * 65_ansi_blocker Community Layout support * rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility) * add LAYOUTS = 65_ansi_blocker to rules.mk * remove width and height keys from info.json
Merge remote-tracking branch 'origin/master' into develop
Remove more cruft in keyboard files (#14288)
Merge remote-tracking branch 'origin/master' into develop
[Keymap] Update iris fluffactually keymap (#14265) Co-authored-by: Drashna Jaelre <drashna@live.com>