Merge remote-tracking branch 'origin/master' into develop
owl8: add info.json file (#14256) * owl8: add info.json file * remove width and height keys (per fauxpark) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Fix typos from 14248 (#14261)
Merge remote-tracking branch 'origin/master' into develop
Fix snailmap compilation error (#14250) * Fix snailmap compilation error * Update keymap.c with correct OLED_ENABLE defines
Change keyboard level include guards to `pragma once` (#14248) * Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
Merge remote-tracking branch 'origin/master' into develop
mnk50: Configurator Fix and Layout Macro Additions (#14257) Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
[Keymap] cwebster2 Keymap and userspace updates (#14258)
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)