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
..
ajp10304	[Keymap] Quark AJP10304 layout (#13290)	2021-08-19 10:36:20 -07:00
cockpit	[Keymap] Update jj40:cockpit keymap (#6089)	2019-06-07 13:21:24 -07:00
default	[Keyboard] Update default keymaps to use layer_state_t (#7444)	2019-11-21 22:40:29 -08:00
fun40	Remove Full Bootmagic (#13846)	2021-08-06 23:59:56 -07:00
krusli
oscillope	Remove Full Bootmagic (#13846)	2021-08-06 23:59:56 -07:00
skewwhiffy	keymap_extras: Remove deprecated defines (#12949)	2021-07-06 09:05:11 +10:00
stevexyz	Remove Full Bootmagic (#13846)	2021-08-06 23:59:56 -07:00
suzuken
via	Add VIA support for JJ40 (#10263)	2020-09-11 00:03:49 -07:00
waples	Remove Full Bootmagic (#13846)	2021-08-06 23:59:56 -07:00