James Young 4279b14adf Merge remote-tracking branch 'upstream/master' into develop ... Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk		2021-08-19 11:32:23 -07:00
..
bcat	[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)	2021-08-03 09:39:43 -07:00
bfiedler
bjohnson	Remove Full Bootmagic (#13846)	2021-08-06 23:59:56 -07:00
bramver
default
default65
default65macro
draevin
drashna_ms
georgepetri	[Bug] Develop - Change uint32_t to layer_state_t (#13596)	2021-07-19 09:50:55 -07:00
joestrong
jonavin	[Keymap] Add jonavin user space / common functions (#13876)	2021-08-19 10:45:49 -07:00
kingwangwong
rogthefrog
unausgeschlafen
via
yoryer